OSDN Git Service
RoboErik [Mon, 2 Feb 2015 23:21:29 +0000 (15:21 -0800)]
Fix crash in dumpsys media_session
Changes the dump to use the correct keys instead of just counting
when doing a dump of users.
Change-Id: Ibb2033f1cc9209fff03e5cf4928acacca29fc11b
Joe Fernandez [Mon, 2 Feb 2015 20:38:56 +0000 (20:38 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
Scott Kennedy [Mon, 2 Feb 2015 20:38:08 +0000 (20:38 +0000)]
Merge "Add some @Nullable annotations to SharedPreferences"
Joe Fernandez [Mon, 2 Feb 2015 20:37:46 +0000 (20:37 +0000)]
am
e9557d7d: am
175ddbcf: am
d14b6432: am
eba583e3: docs: February 2015 Dashboard updates automerge:
c6ca860 automerge:
d99924d
* commit '
e9557d7d2728d1c77e4d173e8f6d954eeeb69357':
docs: February 2015 Dashboard updates
Andrew Lee [Fri, 30 Jan 2015 21:23:21 +0000 (13:23 -0800)]
Reset keyguard/bouncer on "return to call".
+ Add callback, to be invoked when EmergencyButton is clicked when
inside a call.
+ Route callback to the KeyguardViewMediator, to invoke
resetStateLocked() to reset the bouncer.
Bug:
18977746
Change-Id: I4733ccfb6809c4610184a33a28ba38ecf255231f
Joe Fernandez [Mon, 2 Feb 2015 20:29:31 +0000 (20:29 +0000)]
am
175ddbcf: am
d14b6432: am
eba583e3: docs: February 2015 Dashboard updates automerge:
c6ca860
automerge:
d99924d
* commit '
d99924d556b95bc05bbff9408519e301983193fb':
docs: February 2015 Dashboard updates
Jorim Jaggi [Mon, 2 Feb 2015 19:53:55 +0000 (19:53 +0000)]
Merge "Merge commit '
83eaf6cc' into HEAD"
Jorim Jaggi [Mon, 2 Feb 2015 19:45:32 +0000 (20:45 +0100)]
Merge commit '
83eaf6cc' into HEAD
Change-Id: I13918ee8116ac17169910a1414de913bcc2d184e
destradaa [Mon, 2 Feb 2015 19:42:20 +0000 (11:42 -0800)]
Revert API breaking change in System API.
Change introduced in ag/616521
Change-Id: Ia95982b051496e123b4a179746aea15c6a0b8a65
Joe Fernandez [Mon, 2 Feb 2015 19:35:00 +0000 (19:35 +0000)]
am
175ddbcf: am
d14b6432: am
eba583e3: docs: February 2015 Dashboard updates automerge:
c6ca860
* commit '
175ddbcf2ed71fdcd44a9b64cdc5d479df496a4d':
docs: February 2015 Dashboard updates
Jorim Jaggi [Mon, 2 Feb 2015 19:30:34 +0000 (19:30 +0000)]
am
515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev
automerge:
2ffb340
* commit '
2ffb3400f7922aba597b61cea91b82bcfc3d7e7d':
Send accessibility event when bouncer is shown
Jorim Jaggi [Mon, 2 Feb 2015 19:25:34 +0000 (19:25 +0000)]
am
515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev
* commit '
515148dcaaf5b63e69998d67958829d4347071ec':
Send accessibility event when bouncer is shown
Joe Fernandez [Mon, 2 Feb 2015 19:24:38 +0000 (19:24 +0000)]
am
d14b6432: am
eba583e3: docs: February 2015 Dashboard updates
automerge:
c6ca860
* commit '
c6ca8600a4257b25d2ffd1ab6abe02089d06b3d7':
docs: February 2015 Dashboard updates
Jorim Jaggi [Mon, 2 Feb 2015 19:19:23 +0000 (19:19 +0000)]
Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev
Jorim Jaggi [Mon, 2 Feb 2015 13:45:39 +0000 (14:45 +0100)]
Send accessibility event when bouncer is shown
Bug:
18996476
Change-Id: I0e402aa198263807e3013c7fb151f28d049ea51a
Brian Attwell [Wed, 28 Jan 2015 22:15:41 +0000 (14:15 -0800)]
Remove NAME_VERIFIED. Part 4
Bug:
18777272
Change-Id: I1579a3122b2d45b80de7106a2b9616e323855045
destradaa [Mon, 2 Feb 2015 18:07:40 +0000 (18:07 +0000)]
Merge "Fix race condition generating READY and NOT_SUPPORTED statuses."
Alan Viverette [Mon, 2 Feb 2015 18:01:03 +0000 (18:01 +0000)]
Merge "Ensure InsetDrawable propagates state and callback on set drawable"
Alan Viverette [Mon, 2 Feb 2015 17:56:49 +0000 (09:56 -0800)]
Ensure InsetDrawable propagates state and callback on set drawable
Bug:
19230432
Change-Id: I161e377c5a50fd68718a36cef0038ab06e74c90d
Julia Reynolds [Mon, 2 Feb 2015 17:52:03 +0000 (17:52 +0000)]
Merge "Add skip encryption constants for device owner provisioning."
RoboErik [Mon, 2 Feb 2015 17:47:51 +0000 (17:47 +0000)]
Merge "Route volume keys directly to the audio system on TVs"
Joe Fernandez [Mon, 2 Feb 2015 17:44:26 +0000 (17:44 +0000)]
am
d14b6432: am
eba583e3: docs: February 2015 Dashboard updates
* commit '
d14b64323ff92be9db804d66a1146693c27150a6':
docs: February 2015 Dashboard updates
Julia Reynolds [Mon, 2 Feb 2015 14:54:26 +0000 (09:54 -0500)]
Add skip encryption constants for device owner provisioning.
Bug:
19228730
Change-Id: Id5022f2f669cf0dfc1b1523190da52c77238a02c
Jason Monk [Mon, 2 Feb 2015 17:39:43 +0000 (17:39 +0000)]
Merge "Create SettingsLib"
Robert Greenwalt [Mon, 2 Feb 2015 17:33:09 +0000 (17:33 +0000)]
am
0cdd4560: am
fabf0e0b: Merge "Fixing up the formatting code which is already merged"
automerge:
21475c6
* commit '
21475c6a92b893f5d078ba23f06f0be6edaaacbd':
Robert Greenwalt [Mon, 2 Feb 2015 17:29:21 +0000 (17:29 +0000)]
am
0cdd4560: am
fabf0e0b: Merge "Fixing up the formatting code which is already merged"
* commit '
0cdd4560dac5784dda169863eb844d489bdc79d5':
Sailesh Nepal [Mon, 2 Feb 2015 17:24:01 +0000 (17:24 +0000)]
Merge "Update setNextPostDialWaitChar API"
Joe Fernandez [Mon, 2 Feb 2015 17:20:35 +0000 (17:20 +0000)]
am
eba583e3: docs: February 2015 Dashboard updates
* commit '
eba583e3930891f7a8a0e48a961a4a2471fc757c':
docs: February 2015 Dashboard updates
Robert Greenwalt [Mon, 2 Feb 2015 17:16:32 +0000 (17:16 +0000)]
am
fabf0e0b: Merge "Fixing up the formatting code which is already merged"
* commit '
fabf0e0ba84e0cd28f459360b20386e68179cc31':
Robert Greenwalt [Mon, 2 Feb 2015 17:00:42 +0000 (17:00 +0000)]
Merge "Fixing up the formatting code which is already merged"
Joe Fernandez [Mon, 2 Feb 2015 16:48:42 +0000 (08:48 -0800)]
docs: February 2015 Dashboard updates
Change-Id: I1936395193ec4c382b2492f992149fa7a29c9282
Jason Monk [Tue, 13 Jan 2015 15:08:23 +0000 (10:08 -0500)]
Create SettingsLib
This will hold common code that SystemUI and Settings (and others)
will share.
Bug:
19180466
Change-Id: I6614b31d6c3b0a2d426a2aa8ce66725245339d22
Geoff Mendal [Mon, 2 Feb 2015 16:13:19 +0000 (16:13 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 2 Feb 2015 16:08:46 +0000 (08:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3cdaa15e3d76d202fc23185b5319b92bc23fc744
Auto-generated-cl: translation import
Tyler Gunn [Mon, 2 Feb 2015 16:02:08 +0000 (16:02 +0000)]
am
235f60bc: am
4143b796: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev
automerge:
736cb49
* commit '
736cb492aea736e9c3b33fe20285f531497462d0':
Fixing conference merge where only one party is added to conference.
Tyler Gunn [Mon, 2 Feb 2015 16:00:12 +0000 (16:00 +0000)]
am
235f60bc: am
4143b796: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev
* commit '
235f60bc134646d1ce18ab872b982ff63b14845e':
Fixing conference merge where only one party is added to conference.
Geoff Mendal [Mon, 2 Feb 2015 15:53:41 +0000 (15:53 +0000)]
Merge "Import translations. DO NOT MERGE"
Tyler Gunn [Mon, 2 Feb 2015 15:53:00 +0000 (15:53 +0000)]
am
4143b796: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev
* commit '
4143b796bc20072a12fe31cbfdf4f1918dff0728':
Fixing conference merge where only one party is added to conference.
Geoff Mendal [Mon, 2 Feb 2015 15:52:02 +0000 (07:52 -0800)]
Import translations. DO NOT MERGE
Change-Id: I11260e50c0c2ca497a300fe79a25810d4a0b6c9a
Auto-generated-cl: translation import
Tyler Gunn [Mon, 2 Feb 2015 15:48:52 +0000 (15:48 +0000)]
Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev
Mathieu Chartier [Mon, 2 Feb 2015 15:38:30 +0000 (15:38 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
Geoff Mendal [Mon, 2 Feb 2015 15:37:07 +0000 (15:37 +0000)]
am
aea95a6a: (-s ours) am
c6fc5287: (-s ours) Import translations. DO NOT MERGE
* commit '
aea95a6a59468690102f6ffe2a5d92f99b0c91e9':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Feb 2015 15:33:47 +0000 (15:33 +0000)]
am
c6fc5287: (-s ours) Import translations. DO NOT MERGE
automerge:
aea95a6 -s ours
* commit '
aea95a6a59468690102f6ffe2a5d92f99b0c91e9':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Feb 2015 15:30:25 +0000 (15:30 +0000)]
am
c6fc5287: (-s ours) Import translations. DO NOT MERGE
* commit '
c6fc5287138744a4684a837c883dedde14359612':
Import translations. DO NOT MERGE
Jorim Jaggi [Mon, 2 Feb 2015 15:17:46 +0000 (15:17 +0000)]
Merge "Split status bar icon management into separate class"
Jorim Jaggi [Wed, 21 Jan 2015 18:22:26 +0000 (19:22 +0100)]
Split status bar icon management into separate class
Change-Id: Iaacfcb70ff16d894287603d5fc6351598c7450d6
Jorim Jaggi [Mon, 2 Feb 2015 15:13:54 +0000 (15:13 +0000)]
Merge "Show status bar header in SHADE_LOCKED"
Geoff Mendal [Mon, 2 Feb 2015 14:55:47 +0000 (14:55 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 2 Feb 2015 14:52:26 +0000 (06:52 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9c23372467960ad066b9089b4a76e3a257d147eb
Auto-generated-cl: translation import
Geoff Mendal [Mon, 2 Feb 2015 14:40:30 +0000 (06:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5113a08f43c71e78b43dc3c73f8c329adc411e9a
Auto-generated-cl: translation import
Geoff Mendal [Mon, 2 Feb 2015 14:39:50 +0000 (08:39 -0600)]
Import translations. DO NOT MERGE
Change-Id: I1151a10a47c8545c3db3445a2cdbe6edffa6c177
Auto-generated-cl: translation import
Marcin Kosiba [Mon, 2 Feb 2015 10:22:34 +0000 (10:22 +0000)]
Merge "Update docs to say onPageStarted is not called for fragment navigations."
Marcin Kosiba [Mon, 2 Feb 2015 10:22:16 +0000 (10:22 +0000)]
Merge "Update docs for WebResourceRequest.hasUserGesture."
Robert Greenwalt [Wed, 21 Jan 2015 19:52:20 +0000 (19:52 +0000)]
Fixing up the formatting code which is already merged
I just apply google coding guide like space.
Uploading the same code about + handling just apply the Google Coding Guide.
The previous code is "https://android-review.googlesource.com/#/c/122770/"
This code is about + plus number converting logic for international NANP.
Change-Id: I23e4709294c603b387b28b3c2a56c932d838c666
Sailesh Nepal [Sat, 31 Jan 2015 23:17:19 +0000 (15:17 -0800)]
Update setNextPostDialWaitChar API
This CL does the following:
- make the API public
- rename it from setNextPostDialWaitChar to setNextPostDialChar
- remove reference to "wait" from the API documentation
BUG:
19216940,
19216942
Change-Id: Ic4c7f44a900fd79875318d8c565c3aacaa42b962
Jon Larimer [Sat, 31 Jan 2015 05:46:42 +0000 (05:46 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation automerge:
5c9d0de automerge:
9e7e8af automerge:
27d099a automerge:
4a82635 automerge:
dcce25a automerge:
4f78e0b
automerge:
f96d6bc
* commit '
f96d6bc684481a751c4cb25631ff87a4264d6e0d':
Jon Larimer [Sat, 31 Jan 2015 05:44:27 +0000 (05:44 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation automerge:
5c9d0de automerge:
9e7e8af automerge:
27d099a automerge:
4a82635 automerge:
dcce25a
automerge:
4f78e0b
* commit '
4f78e0b1e849193f5e70447171b4f30ad0aee700':
Jon Larimer [Sat, 31 Jan 2015 05:27:30 +0000 (05:27 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation automerge:
5c9d0de automerge:
9e7e8af automerge:
27d099a automerge:
4a82635
automerge:
dcce25a
* commit '
dcce25a9a7fb3458f2fb65b23912b5f7eb42c596':
Jon Larimer [Sat, 31 Jan 2015 05:19:19 +0000 (05:19 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation automerge:
5c9d0de automerge:
9e7e8af automerge:
27d099a
automerge:
4a82635
* commit '
4a826358e769e697ec329cf14edeb049981a11a9':
Jon Larimer [Sat, 31 Jan 2015 05:03:24 +0000 (05:03 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation automerge:
5c9d0de automerge:
9e7e8af
automerge:
27d099a
* commit '
27d099a7e128744b7a11ce09b469a3396e872d33':
Joe Fernandez [Sat, 31 Jan 2015 04:25:18 +0000 (04:25 +0000)]
am
1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge:
f02a8d9 automerge:
cacf7da automerge:
346a9a2 automerge:
f4b2bd4
automerge:
14437e4
* commit '
14437e4781fea9688b7c68ec6c3201e8a926ab04':
docs: training intent doc error update
Deepanshu Gupta [Sat, 31 Jan 2015 04:23:50 +0000 (04:23 +0000)]
am
3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge:
7789447 automerge:
580937f automerge:
c053438
automerge:
df5a198
* commit '
df5a1987108539c703477adff3749d647ba313c5':
Limited AppCompat support
Deepanshu Gupta [Sat, 31 Jan 2015 04:22:45 +0000 (04:22 +0000)]
am
1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge:
7e683bd automerge:
1575ca6 automerge:
862cdd6
automerge:
6a43990
* commit '
6a439908fcc103696dd90bc42494231b54b7a10b':
Resource resolution fixes.
Joe Fernandez [Sat, 31 Jan 2015 04:20:19 +0000 (04:20 +0000)]
am
1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge:
f02a8d9 automerge:
cacf7da automerge:
346a9a2
automerge:
f4b2bd4
* commit '
f4b2bd4c41233327f0fb2e4d45af8dc9c8eba689':
docs: training intent doc error update
Deepanshu Gupta [Sat, 31 Jan 2015 04:18:58 +0000 (04:18 +0000)]
am
3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge:
7789447 automerge:
580937f
automerge:
c053438
* commit '
c05343828611ed0b82fae4edf7fe11e0e9087db1':
Limited AppCompat support
Deepanshu Gupta [Sat, 31 Jan 2015 04:17:35 +0000 (04:17 +0000)]
am
1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge:
7e683bd automerge:
1575ca6
automerge:
862cdd6
* commit '
862cdd6f11490c060842599a58a400e284c937d9':
Resource resolution fixes.
Joe Fernandez [Sat, 31 Jan 2015 04:01:11 +0000 (04:01 +0000)]
am
1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge:
f02a8d9 automerge:
cacf7da
automerge:
346a9a2
* commit '
346a9a2f364f7cdabf06944014594b299d384082':
docs: training intent doc error update
Deepanshu Gupta [Sat, 31 Jan 2015 03:59:37 +0000 (03:59 +0000)]
am
3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge:
7789447
automerge:
580937f
* commit '
580937fc45bc5ef97e45f1eaf67945a07c5ce41f':
Limited AppCompat support
Deepanshu Gupta [Sat, 31 Jan 2015 03:58:26 +0000 (03:58 +0000)]
am
1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge:
7e683bd
automerge:
1575ca6
* commit '
1575ca6e1a713f9d2e4a9f91bc6943ae10fde083':
Resource resolution fixes.
Jon Larimer [Sat, 31 Jan 2015 03:39:19 +0000 (03:39 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation automerge:
5c9d0de
automerge:
9e7e8af
* commit '
9e7e8afbb934742cb7996b22e32f94c1c09704af':
Joe Fernandez [Sat, 31 Jan 2015 03:04:16 +0000 (03:04 +0000)]
am
1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge:
f02a8d9
automerge:
cacf7da
* commit '
cacf7da1c4d078641f099bab717e155609c5dc99':
docs: training intent doc error update
Deepanshu Gupta [Sat, 31 Jan 2015 03:02:42 +0000 (03:02 +0000)]
am
3d5535cf: Merge "Limited AppCompat support" into lmp-dev
automerge:
7789447
* commit '
7789447bd97c851b7a09623a417300590e5439d5':
Limited AppCompat support
Deepanshu Gupta [Sat, 31 Jan 2015 03:01:20 +0000 (03:01 +0000)]
am
1d59871e: Merge "Resource resolution fixes." into lmp-dev
automerge:
7e683bd
* commit '
7e683bdaddff77a24a36d420c5782b47795c5ccb':
Resource resolution fixes.
Joe Fernandez [Sat, 31 Jan 2015 02:50:57 +0000 (02:50 +0000)]
am
1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs
automerge:
f02a8d9
* commit '
f02a8d9ffcd2f14c069b23d588ff2083cc53062d':
docs: training intent doc error update
Joe Fernandez [Sat, 31 Jan 2015 01:59:54 +0000 (01:59 +0000)]
am
1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs
* commit '
1a9bf5c10049e99398a80b985e22ea1bfd737bcd':
docs: training intent doc error update
Joe Fernandez [Sat, 31 Jan 2015 01:00:15 +0000 (01:00 +0000)]
Merge "docs: training intent doc error update" into lmp-docs
Rich Slogar [Wed, 28 Jan 2015 23:22:24 +0000 (15:22 -0800)]
docs: training intent doc error update
b/
18386294
Change-Id: Id0fb07e567e0f698e786ac57a19c60895f4d6fc1
Deepanshu Gupta [Sat, 31 Jan 2015 00:54:10 +0000 (00:54 +0000)]
am
3d5535cf: Merge "Limited AppCompat support" into lmp-dev
* commit '
3d5535cfb7755c20619529649b025c4682013b85':
Limited AppCompat support
Deepanshu Gupta [Sat, 31 Jan 2015 00:54:07 +0000 (00:54 +0000)]
am
1d59871e: Merge "Resource resolution fixes." into lmp-dev
* commit '
1d59871e4e8a3a657dab3931d684706c45630a2f':
Resource resolution fixes.
Deepanshu Gupta [Sat, 31 Jan 2015 00:50:34 +0000 (00:50 +0000)]
Merge "Limited AppCompat support" into lmp-dev
Deepanshu Gupta [Sat, 31 Jan 2015 00:48:56 +0000 (00:48 +0000)]
Merge "Resource resolution fixes." into lmp-dev
Joe Fernandez [Sat, 31 Jan 2015 00:35:00 +0000 (00:35 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
Joe Fernandez [Sat, 31 Jan 2015 00:34:50 +0000 (00:34 +0000)]
am
52c39c27: am
5c37c8e6: am
d801a123: am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs automerge:
3548de6 automerge:
95fa882
* commit '
52c39c27e9f5fde74e2d326c6a3560334fbea926':
docs: studio emulator platform update
Joe Fernandez [Sat, 31 Jan 2015 00:33:23 +0000 (00:33 +0000)]
am
5c37c8e6: am
d801a123: am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs automerge:
3548de6 automerge:
95fa882
automerge:
52c39c2
* commit '
52c39c27e9f5fde74e2d326c6a3560334fbea926':
docs: studio emulator platform update
Alan Viverette [Sat, 31 Jan 2015 00:30:31 +0000 (00:30 +0000)]
Merge "Synchronize mutated constant state's drawable constant state"
Joe Fernandez [Sat, 31 Jan 2015 00:29:37 +0000 (00:29 +0000)]
am
5c37c8e6: am
d801a123: am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs automerge:
3548de6
automerge:
95fa882
* commit '
95fa88250a1957c7adfbd35d52f62e42cbe03df6':
docs: studio emulator platform update
Joe Fernandez [Sat, 31 Jan 2015 00:25:04 +0000 (00:25 +0000)]
am
5c37c8e6: am
d801a123: am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
automerge:
3548de6
* commit '
3548de60735a79d3e7087c26ae491a7f38da5b4d':
docs: studio emulator platform update
Alan Viverette [Sat, 31 Jan 2015 00:21:46 +0000 (00:21 +0000)]
Merge "Use inherited visibility to set visibility of managed drawables"
Alan Viverette [Sat, 31 Jan 2015 00:19:45 +0000 (16:19 -0800)]
Synchronize mutated constant state's drawable constant state
Mutating InsetDrawable's locally-held drawable alters its constant state,
so we need to update the InsetDrawable's reference to match. This ensures
that any drawables created using getConstantState().newDrawable() will
match the mutated versions.
Bug:
19213175
Change-Id: If9063bcc0942691a8940443e607f2dc722fc6e13
Joe Fernandez [Sat, 31 Jan 2015 00:14:39 +0000 (00:14 +0000)]
am
5c37c8e6: am
d801a123: am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
* commit '
5c37c8e66227b15d471047e7c4c986cf3c67876a':
docs: studio emulator platform update
Jon Larimer [Sat, 31 Jan 2015 00:05:54 +0000 (00:05 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
automerge:
5c9d0de
* commit '
5c9d0de174caf151937f19aa6898f60bce3fb4f4':
Fix build breakage in older branches by avoiding <> notation
Alan Viverette [Fri, 30 Jan 2015 23:55:48 +0000 (15:55 -0800)]
Use inherited visibility to set visibility of managed drawables
Previously we only used direct visibility, which resulted in strange
behavior when a parent view with an animated child was hidden. We were
also incorrectly awakening scroll bars for non-visible views, though
that's a much less visible (pun intended) bug.
Only handles the two most common cases for ripples. A subsequent CL will
update handling of View drawable management and fix this for all managed
drawables.
Bug:
15350931
Change-Id: I0d0fe2c51210e8d2e0a73b0248cec3b93bfc36f5
Joe Fernandez [Fri, 30 Jan 2015 23:41:10 +0000 (23:41 +0000)]
am
d801a123: am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
* commit '
d801a1238392b8c7a8e0131cee89370143363046':
docs: studio emulator platform update
Scott Kennedy [Fri, 30 Jan 2015 23:36:07 +0000 (15:36 -0800)]
Add some @Nullable annotations to SharedPreferences
Change-Id: I26e7a02a18d802902fca6892bed77b4f98ccf3ee
Joe Fernandez [Fri, 30 Jan 2015 23:34:44 +0000 (23:34 +0000)]
am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
* commit '
2b68ab3adda1ecce045b7b56b8c37ab4d960d2b4':
docs: studio emulator platform update
Joe Fernandez [Fri, 30 Jan 2015 23:24:43 +0000 (23:24 +0000)]
Merge "docs: studio emulator platform update" into lmp-docs
John Reck [Fri, 30 Jan 2015 23:12:42 +0000 (23:12 +0000)]
Merge "Add a WAIT_FOR_GPU_COMPLETION option"
Jon Larimer [Fri, 30 Jan 2015 22:41:30 +0000 (22:41 +0000)]
am
3a6d8f54: am
90d5bd8d: am
feb362a5: am
a0d3bfbe: am
5c9d0de1: am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
automerge:
ff526fa
* commit '
ff526fa7106fd45bfc4f1606fe051000c5201920':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 22:40:17 +0000 (22:40 +0000)]
am
3a6d8f54: am
90d5bd8d: am
feb362a5: am
a0d3bfbe: am
5c9d0de1: am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
3a6d8f5473f2451a0bdf13d4cc1d31e419d23f0c':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 22:33:13 +0000 (22:33 +0000)]
am
90d5bd8d: am
feb362a5: am
a0d3bfbe: am
5c9d0de1: am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
90d5bd8daab404afc50470f5c19ea725bd2466fe':
Fix build breakage in older branches by avoiding <> notation
OSDN Git Service
