Ben Cheng
2115c63fa1
Merge "Clean up the stack trace symbolization tool."
2013-05-01 23:51:21 +00:00
Adam Powell
bfff1a159b
am e2676ddf: am 04c8633d: Update Support7Demos for action bar compat API changes.
...
* commit 'e2676ddf6727c8f6a641d1100baeed6163fbcef7':
Update Support7Demos for action bar compat API changes.
2013-04-30 14:09:03 -07:00
Adam Powell
e2676ddf67
am 04c8633d: Update Support7Demos for action bar compat API changes.
...
* commit '04c8633deeb6eaa3f699f97d4a4e59e596e83ff0':
Update Support7Demos for action bar compat API changes.
2013-04-30 14:04:11 -07:00
Chris Banes
8942438f38
Update Support7Demos for MenuInflater change:
...
I7a4504aeae2795e8d9d6f4cd4ecd20b8d4ea7602
Change-Id: I4896483669c877f3d8ed05a81d789750b39ab32d
Signed-off-by: Chris Banes <chrisbanes@google.com >
2013-04-30 12:07:57 +01:00
Adam Powell
04c8633dee
Update Support7Demos for action bar compat API changes.
...
Change-Id: I61914ff777a0eada9525db6fad7d53c97303eb36
2013-04-29 17:38:23 -07:00
Ben Cheng
adc56b603e
Clean up the stack trace symbolization tool.
...
[cherry-picked from internal master]
Change-Id: Idba672b1c12d17b790c7901514f90b7f14f7256c
2013-04-29 17:24:52 -07:00
Ben Cheng
b42dad0dee
Clean up the stack trace symbolization tool.
...
Change-Id: Id71cacde653a5c1c92a028ee80f5aa8264e1963a
2013-04-25 15:34:14 -07:00
Michael Wright
b32539b1e4
am 4f842f00: am a7d5ca6b: Stop errors being logged erroneously on event predispatch
...
* commit '4f842f0072b0dc271a93f848d080aa01fcca0643':
Stop errors being logged erroneously on event predispatch
2013-04-23 16:48:39 -07:00
Fabrice Di Meglio
8a22572ebd
am 10db3e0f: am c7023a80: Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev
...
* commit '10db3e0f1198184527c845b8424c328fc16737b0':
Fix bug #8656546 API REVIEW: android.text.bidi / android.text
2013-04-23 16:48:38 -07:00
Jeff Brown
f0bafd5822
am dd22bb2a: am 8db95167: Merge "appcompat: Add samples for options menu usage with fragments." into jb-mr2-dev
...
* commit 'dd22bb2a7df2152dd37d0b24e276d075d4e973e0':
appcompat: Add samples for options menu usage with fragments.
2013-04-23 16:48:37 -07:00
Kenny Root
45736fcf77
am 8d581dbf: am 0190c7dd: Merge "Add Android KeyStore API demo" into jb-mr2-dev
...
* commit '8d581dbfc54d15ae4001c9c8fb9aeb0bd478ef35':
Add Android KeyStore API demo
2013-04-23 16:48:37 -07:00
Michael Wright
4f842f0072
am a7d5ca6b: Stop errors being logged erroneously on event predispatch
...
* commit 'a7d5ca6b2eaaa5a1c7766dea477c0d6c795b3721':
Stop errors being logged erroneously on event predispatch
2013-04-23 16:46:09 -07:00
Fabrice Di Meglio
10db3e0f11
am c7023a80: Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev
...
* commit 'c7023a80c971a70d3093de12427721d6bf0ca745':
Fix bug #8656546 API REVIEW: android.text.bidi / android.text
2013-04-23 16:46:08 -07:00
Jeff Brown
dd22bb2a7d
am 8db95167: Merge "appcompat: Add samples for options menu usage with fragments." into jb-mr2-dev
...
* commit '8db9516710589f3ca1a7c1a35348ad0e6b03ed08':
appcompat: Add samples for options menu usage with fragments.
2013-04-23 16:46:08 -07:00
Kenny Root
8d581dbfc5
am 0190c7dd: Merge "Add Android KeyStore API demo" into jb-mr2-dev
...
* commit '0190c7ddaa512b0351973cde55fde65c47096954':
Add Android KeyStore API demo
2013-04-23 16:46:02 -07:00
Michael Wright
a7d5ca6b2e
Stop errors being logged erroneously on event predispatch
...
Change-Id: Ie4d15a7d01b9d63e7db16a2701024e6108eb0cc0
2013-04-22 18:11:08 -07:00
Andrew Hsieh
82465add77
am db967948: am 98815e31: Merge "Fix x86 endian.h"
...
* commit 'db967948ae83f61da106b521ae40ff4203d74620':
Fix x86 endian.h
2013-04-21 20:42:16 -07:00
Andrew Hsieh
db967948ae
am 98815e31: Merge "Fix x86 endian.h"
...
* commit '98815e312404638a2ced6683ee0e80769b695273':
Fix x86 endian.h
2013-04-21 20:40:29 -07:00
Andrew Hsieh
98815e3124
Merge "Fix x86 endian.h"
2013-04-22 03:33:59 +00:00
Andrew Hsieh
25c7f95934
Fix x86 endian.h
...
See https://code.google.com/p/android/issues/detail?id=54465
and https://android-review.googlesource.com/#/c/57242
Change-Id: Ib61fc0696e4979421f9bc6916c776a41fdc8be71
2013-04-22 11:25:41 +08:00
Fabrice Di Meglio
c7023a80c9
Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev
2013-04-20 00:42:58 +00:00
Fabrice Di Meglio
9851ff9ca4
Fix bug #8656546 API REVIEW: android.text.bidi / android.text
...
- clean BidiFormatter APIs
Change-Id: I231a3511850b7149f675debb68e2dd7f1de8308b
2013-04-19 17:28:23 -07:00
Jeff Brown
8db9516710
Merge "appcompat: Add samples for options menu usage with fragments." into jb-mr2-dev
2013-04-20 00:28:10 +00:00
Kenny Root
0190c7ddaa
Merge "Add Android KeyStore API demo" into jb-mr2-dev
2013-04-20 00:00:10 +00:00
Kenny Root
f59ea3b54e
Add Android KeyStore API demo
...
Adds a sample application which uses the AndroidKeyStore and
KeyPairGenerator for AndroidKeyStore.
Bug: 8608817
Change-Id: Iec78a74461dc259e4080ed1fab7d923593fcdf75
2013-04-19 11:50:06 -07:00
Dianne Hackborn
f1711f2707
am 6931cb5e: am 3da1568a: Merge "Update to follow TransportMediator API changes." into jb-mr2-dev
...
* commit '6931cb5e684d21683207bd75e0b096050ff160fa':
Update to follow TransportMediator API changes.
2013-04-19 11:10:26 -07:00
Dianne Hackborn
6931cb5e68
am 3da1568a: Merge "Update to follow TransportMediator API changes." into jb-mr2-dev
...
* commit '3da1568ae86f49fbe9f239e0e4f6d0389e4bacd7':
Update to follow TransportMediator API changes.
2013-04-19 11:03:36 -07:00
Dianne Hackborn
3da1568ae8
Merge "Update to follow TransportMediator API changes." into jb-mr2-dev
2013-04-19 17:58:00 +00:00
Adam Powell
8c7e1d8598
am 44888493: am 4f48d974: resolved conflicts for merge of b105894b to jb-mr2-dev
...
* commit '4488849397c783a3699cc526d5ae726cd6484173':
Add Support4Demos examples for DrawerLayout and SlidingPaneLayout
2013-04-19 09:48:51 -07:00
Adam Powell
4488849397
am 4f48d974: resolved conflicts for merge of b105894b to jb-mr2-dev
...
* commit '4f48d974410137961fc06139aa44ae038269705b':
Add Support4Demos examples for DrawerLayout and SlidingPaneLayout
2013-04-19 09:45:12 -07:00
Adam Powell
4f48d97441
resolved conflicts for merge of b105894b to jb-mr2-dev
...
Change-Id: Ifa617d1807d29e91998d98482e50bdd40ee61b1a
2013-04-19 09:35:00 -07:00
Adam Powell
b105894b1b
am 2622ae27: am 98c5d4a2: Add Support4Demos examples for DrawerLayout and SlidingPaneLayout
...
* commit '2622ae27adefc16299deb611dc040bec5ad59c73':
Add Support4Demos examples for DrawerLayout and SlidingPaneLayout
2013-04-19 09:23:31 -07:00
Adam Powell
2622ae27ad
am 98c5d4a2: Add Support4Demos examples for DrawerLayout and SlidingPaneLayout
...
* commit '98c5d4a228a45a3240afe82f269bb90f91b8e6a5':
Add Support4Demos examples for DrawerLayout and SlidingPaneLayout
2013-04-19 09:21:03 -07:00
Jeff Brown
e14dfaf571
appcompat: Add samples for options menu usage with fragments.
...
Bug: 8661191
Change-Id: I3664f00c09d81c01b904f8c5203a69a12180c565
2013-04-18 23:38:33 -07:00
Dianne Hackborn
74c5bcff29
Update to follow TransportMediator API changes.
...
Change-Id: Icedd0fbe15cf84ff4d3f0c59826f698e92138b47
2013-04-18 18:26:18 -07:00
Adam Powell
98c5d4a228
Add Support4Demos examples for DrawerLayout and SlidingPaneLayout
...
Show basic usage of these two new widgets.
Change-Id: I1ec82041c198e2b2853a0d1eb07e0ab78dbea61c
2013-04-18 17:31:30 -07:00
Dianne Hackborn
a750426b79
am f67c9b3a: am 43b9e5a8: Merge "Fix issue #8520788 : Add WakefulBroadcastReceiver" into jb-mr2-dev
...
* commit 'f67c9b3a9d3cfc7eca588fe45013dd6e3f8b6a62':
Fix issue #8520788 : Add WakefulBroadcastReceiver
2013-04-17 16:38:23 -07:00
Dianne Hackborn
f67c9b3a9d
am 43b9e5a8: Merge "Fix issue #8520788 : Add WakefulBroadcastReceiver" into jb-mr2-dev
...
* commit '43b9e5a83b6c9a8d0e62be2a316c81934c5d0e98':
Fix issue #8520788 : Add WakefulBroadcastReceiver
2013-04-17 16:30:05 -07:00
Dianne Hackborn
43b9e5a83b
Merge "Fix issue #8520788 : Add WakefulBroadcastReceiver" into jb-mr2-dev
2013-04-17 23:25:08 +00:00
Winson Chung
f0642e4e29
am 7ebb78ea: am 412de090: Merge "DO NOT MERGE Deferring new collections widget apis. Revert "Updating WeatherListWidget to the new collections widget api."" into jb-mr2-dev
...
* commit '7ebb78ea14b97fe8923701ef0c7a700c74646f6e':
DO NOT MERGE Deferring new collections widget apis. Revert "Updating WeatherListWidget to the new collections widget api."
2013-04-17 14:22:58 -07:00
Winson Chung
7ebb78ea14
am 412de090: Merge "DO NOT MERGE Deferring new collections widget apis. Revert "Updating WeatherListWidget to the new collections widget api."" into jb-mr2-dev
...
* commit '412de090412d75b80204d7b1462c967c39e33c22':
DO NOT MERGE Deferring new collections widget apis. Revert "Updating WeatherListWidget to the new collections widget api."
2013-04-17 13:57:59 -07:00
Winson Chung
412de09041
Merge "DO NOT MERGE Deferring new collections widget apis. Revert "Updating WeatherListWidget to the new collections widget api."" into jb-mr2-dev
2013-04-17 20:52:52 +00:00
Winson Chung
d86ea2c0e0
DO NOT MERGE Deferring new collections widget apis. Revert "Updating WeatherListWidget to the new collections widget api."
...
This reverts commit b28878a5b8 .
2013-04-17 13:42:05 -07:00
Amith Yamasani
9029fe60f5
am 8fabb70d: am 55cadb05: Changes to handle restrictions API change
...
* commit '8fabb70dfcb4991055a5a04c31393b7340d03358':
Changes to handle restrictions API change
2013-04-17 11:34:25 -07:00
Amith Yamasani
8fabb70dfc
am 55cadb05: Changes to handle restrictions API change
...
* commit '55cadb05ded9ddc54e70c6be4fef019b3e8c8439':
Changes to handle restrictions API change
2013-04-17 11:30:37 -07:00
Amith Yamasani
55cadb05de
Changes to handle restrictions API change
...
Framework passes in a Bundle, application returns ArrayList<RestrictionEntry>.
Bug: 8633967
Change-Id: Ib9b1c9fe555a0a87a77b7278d1fe3ef41ca07b9b
2013-04-17 10:48:37 -07:00
Dianne Hackborn
041bfcd9e4
Fix issue #8520788 : Add WakefulBroadcastReceiver
...
Add sample code.
Change-Id: I46f4f25ceb4e12f975e3cebd83f62de2555a8996
2013-04-17 10:33:16 -07:00
Amith Yamasani
6922cdceb1
am 25b86dcb: am fb6dc4fe: Merge "Fix some crashes in the sample" into jb-mr2-dev
...
* commit '25b86dcba49d68697bfcaa656312bcbaca92168f':
Fix some crashes in the sample
2013-04-15 10:42:11 -07:00
Amith Yamasani
25b86dcba4
am fb6dc4fe: Merge "Fix some crashes in the sample" into jb-mr2-dev
...
* commit 'fb6dc4fedf1034e61a792d24094b7f74854f70d4':
Fix some crashes in the sample
2013-04-15 10:38:55 -07:00
Amith Yamasani
fb6dc4fedf
Merge "Fix some crashes in the sample" into jb-mr2-dev
2013-04-15 17:34:04 +00:00