OSDN Git Service
Doris Ling [Fri, 22 Jul 2016 22:18:15 +0000 (22:18 +0000)]
Fix scroll issue when going from Display->Ambient Display to Moves.
am:
2f92d751e0
Change-Id: I2854643c20fd1136a2d789dc96fa24018042f71b
Justin Klaassen [Fri, 22 Jul 2016 22:07:46 +0000 (22:07 +0000)]
Merge \"Add NightDisplaySettingsActivity\" into nyc-mr1-dev
am:
53e9f35239
Change-Id: If6f1f681fa5e1fb8fd1319054fce76fd8472f1c5
Justin Klaassen [Fri, 22 Jul 2016 22:07:06 +0000 (22:07 +0000)]
Add NightDisplaySettingsActivity
am:
eae3d9f932
Change-Id: Ia7cbd7dd7d65d5d04beba607a1ada82aed81d31a
Justin Klaassen [Fri, 22 Jul 2016 21:55:58 +0000 (21:55 +0000)]
Merge "Add NightDisplaySettingsActivity" into nyc-mr1-dev
Anna Galusza [Fri, 22 Jul 2016 21:13:16 +0000 (21:13 +0000)]
Merge \"Fix font and display size settings pages for small screens.\" into nyc-mr1-dev
am:
bbb844f94d
Change-Id: Id52f78751ced368a8119abe8594982d289416da2
Anna Galusza [Fri, 22 Jul 2016 21:13:16 +0000 (21:13 +0000)]
Fix font and display size settings pages for small screens.
am:
798b35ac09
Change-Id: I22f9c500152904bfc593e8c2907ecec7cf36d009
Anna Galusza [Fri, 22 Jul 2016 21:09:35 +0000 (21:09 +0000)]
Merge "Fix font and display size settings pages for small screens." into nyc-mr1-dev
Doris Ling [Fri, 22 Jul 2016 20:28:21 +0000 (13:28 -0700)]
Fix scroll issue when going from Display->Ambient Display to Moves.
Move the scroll-to extra param to inside the launch intent of the doze
preference screen for it to take effect. The original extra param is
added to the preference screen itself as we were defining the fragment
to launch previously.
Change-Id: Id3e8cfbe61b46be2a5945da7e531f1a3c8b1454f
Fixes:
30262357
Fan Zhang [Fri, 22 Jul 2016 20:11:11 +0000 (20:11 +0000)]
Don\'t allow changing data usage setting if uid is not app.
am:
2a84bbcddb
Change-Id: I2584cabeef21606a49d4921027707a36ace324b9
Anna Galusza [Fri, 15 Jul 2016 00:10:35 +0000 (17:10 -0700)]
Fix font and display size settings pages for small screens.
This was particularly broken in split-screen mode.
Bug:
29835212
Change-Id: I141f659e2d2d282d5af1ae97d6c798e53f71f766
Justin Klaassen [Fri, 22 Jul 2016 02:25:17 +0000 (19:25 -0700)]
Add NightDisplaySettingsActivity
- The Settings#ACTION_NIGHT_DISPLAY_SETTINGS action can be used by apps
to launch Night display settings directly.
Bug:
30291948
Change-Id: I5545bb7f0a467116454e5c44e207cbe91ddf9d43
Fan Zhang [Fri, 22 Jul 2016 17:03:52 +0000 (10:03 -0700)]
Don't allow changing data usage setting if uid is not app.
Bug:
30262890
Changing non-app UID's (eg system, firewalld) data usage will just crash.
Change-Id: I1c3f2504aae75f514f962fd54f4dcf240b3bcd81
Doris Ling [Fri, 22 Jul 2016 01:42:47 +0000 (01:42 +0000)]
Merge \"Check for null activity before getting dashboard categories.\" into nyc-mr1-dev
am:
7b03ae69df
Change-Id: Ic16c06b1ced6c4b9f37d0c5e8fc0ecc5a450044f
Doris Ling [Fri, 22 Jul 2016 01:42:47 +0000 (01:42 +0000)]
Check for null activity before getting dashboard categories.
am:
b7e650c6f7
Change-Id: I26f8c96189d3390055a7dd02680da57d2c2ed2cb
Fan Zhang [Fri, 22 Jul 2016 01:42:45 +0000 (01:42 +0000)]
Fix crash when starting Settings -> Display -> Font size
am:
cafe6972a9
Change-Id: I19912b25028cac863d990e01cda1b31b40a183d7
Sunny Goyal [Fri, 22 Jul 2016 01:42:44 +0000 (01:42 +0000)]
Merge \"Updating the shortcut icons for Settings app\" into nyc-mr1-dev
am:
fe9bf6d9d1
Change-Id: Iaf16d11e30a19fe7a9c58e34d3b15045bd9e3d9a
Sunny Goyal [Fri, 22 Jul 2016 01:42:44 +0000 (01:42 +0000)]
Updating the shortcut icons for Settings app
am:
b67291a274
Change-Id: I7ca2cc1587c561313f6d43217c88119496866847
Bill Yi [Fri, 22 Jul 2016 01:42:42 +0000 (01:42 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
2ece9e4894 -s ours
Change-Id: Ie5649d4576ae56c27a75b8fcca8c10124feab9db
Bill Yi [Fri, 22 Jul 2016 01:42:42 +0000 (01:42 +0000)]
Import translations. DO NOT MERGE
am:
1dc5c8bcbf -s ours
Change-Id: I46c2ec6a95f04096b65e4aae83f9264da32f7441
Mark Salyzyn [Fri, 22 Jul 2016 01:41:49 +0000 (01:41 +0000)]
Merge changes from topic \'enable_persist_kernel_log\' into nyc-mr1-dev
am:
8f3c7dd719
Change-Id: I9d6ee829237cfa831f6ae691df5221c1baacc728
Mark Salyzyn [Fri, 22 Jul 2016 01:40:55 +0000 (01:40 +0000)]
Settings: trampoline persist.logd.logpersistd to logd.logpersistd
am:
bdbd2d984e
Change-Id: I77d76c9c8a85bb4e0c9314943b291eab00669ee0
Mark Salyzyn [Fri, 22 Jul 2016 01:40:24 +0000 (01:40 +0000)]
Settings: add logpersist kernel only selection
am:
78dd2e2c74
Change-Id: I000f5830e70083212607a1f971d83fe9f48d4779
Mark Salyzyn [Fri, 22 Jul 2016 01:39:52 +0000 (01:39 +0000)]
Settings: add logpersist selection (actions)
am:
c8b1c3ec22 -s ours
Change-Id: Ia32d1a251d0fc215c651d47373dac539dcb0c21a
Doris Ling [Thu, 21 Jul 2016 20:58:21 +0000 (20:58 +0000)]
Merge "Check for null activity before getting dashboard categories." into nyc-mr1-dev
Fan Zhang [Thu, 21 Jul 2016 20:28:19 +0000 (13:28 -0700)]
Fix crash when starting Settings -> Display -> Font size
Change-Id: I26f81d02e31b0b7c8120395231aa6b81be6be7be
Fixes:
30279736
Doris Ling [Thu, 21 Jul 2016 19:22:17 +0000 (12:22 -0700)]
Check for null activity before getting dashboard categories.
In DashboardSummary, when async task finishes running, ensure that the
fragment is still associated with the activity before getting the
dashboard categories from the activity.
Change-Id: If23cd27a0d3e3429d900ae41ef6f24ed03b9e8d6
Fixes:
30278854
Sunny Goyal [Thu, 21 Jul 2016 18:27:33 +0000 (18:27 +0000)]
Merge "Updating the shortcut icons for Settings app" into nyc-mr1-dev
Sunny Goyal [Thu, 21 Jul 2016 00:18:33 +0000 (17:18 -0700)]
Updating the shortcut icons for Settings app
Bug:
30224034
Bug:
30280907
Change-Id: I6ebf85dbf2941c1cf55e443d611655cdb765da66
TreeHugger Robot [Thu, 21 Jul 2016 04:32:47 +0000 (04:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Thierry Strudel [Thu, 21 Jul 2016 04:07:22 +0000 (04:07 +0000)]
Merge changes from topic 'enable_persist_kernel_log' into nyc-mr1-dev
* changes:
Settings: trampoline persist.logd.logpersistd to logd.logpersistd
Settings: add logpersist kernel only selection
Settings: add logpersist selection (actions)
Bill Yi [Thu, 21 Jul 2016 03:05:32 +0000 (20:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2135a4c00d05ba973eae29159fa7ab87d4dc8bd4
Auto-generated-cl: translation import
Doris Ling [Thu, 21 Jul 2016 02:47:12 +0000 (02:47 +0000)]
Merge \"Get gestures animation preview image in async loader.\" into nyc-mr1-dev
am:
fd922cabd9
Change-Id: I6975f268808cd5f9521cba6922120c667010023d
TreeHugger Robot [Thu, 21 Jul 2016 02:43:37 +0000 (02:43 +0000)]
Merge "Get gestures animation preview image in async loader." into nyc-mr1-dev
Matthew Fritze [Thu, 21 Jul 2016 01:24:09 +0000 (01:24 +0000)]
Merge \"Revert \"Revert \"Error colors to point to frameworks instead of hard-coding them\"\"\" into nyc-mr1-dev
am:
d739ea38fb
Change-Id: I996cd07af5b613d04588f533d979decffb437daa
Doris Ling [Tue, 19 Jul 2016 22:46:50 +0000 (15:46 -0700)]
Get gestures animation preview image in async loader.
When user scrolls in Gestures Settings, the textureview used for the
animation video will be destroyed if the view is scrolled outside the
screen. When the view is scrolled back in, a slight flicker is seen as
the animation video is not instantly made available on the new surface
texture. We are now retrieving the preview image in an async loader
after the preference is created, so that it will not delay the original
loading of the gestures settings page, but the preview will be made
available while we initialize the animation video in the new surface
texture.
Bug:
29790087
Change-Id: I83f4a5bc4f24b7aab4c0cc851cb524c10e74f328
Matthew Fritze [Thu, 21 Jul 2016 01:06:15 +0000 (01:06 +0000)]
Merge \"Revert \"Error colors to point to frameworks instead of hard-coding them\"\" into nyc-mr1-dev
am:
c49c496f1c
Change-Id: Ibf5577a03184aed6ee78704cae48e6d817267873
Matthew Fritze [Thu, 21 Jul 2016 01:04:23 +0000 (01:04 +0000)]
Merge "Revert "Revert "Error colors to point to frameworks instead of hard-coding them""" into nyc-mr1-dev
Matthew Fritze [Thu, 21 Jul 2016 01:03:45 +0000 (01:03 +0000)]
Revert "Revert "Error colors to point to frameworks instead of hard-coding them""
This reverts commit
f179f845e50837a069383f3b268f643c4d2cfad8.
Change-Id: Ie57507b0d6ca76ba9b77836bc4e133f27a3664c7
Andrew Sapperstein [Thu, 21 Jul 2016 00:57:01 +0000 (00:57 +0000)]
Merge "Revert "Error colors to point to frameworks instead of hard-coding them"" into nyc-mr1-dev
Matthew Fritze [Thu, 21 Jul 2016 00:55:21 +0000 (00:55 +0000)]
Revert "Error colors to point to frameworks instead of hard-coding them"
This reverts commit
ae63c3db14f4ddf89d33df894af53fb066226da3.
Change-Id: I2d3069eb5b23aa7df3fc1efc2eb085b493b5564c
Daniel Nishi [Wed, 20 Jul 2016 23:57:46 +0000 (23:57 +0000)]
Merge \"Update the Bluetooth pin pairing view to the new spec.\" into nyc-mr1-dev
am:
391f67e484
Change-Id: Id1f72339ea39ce4d734f9cc869c5c2c2a4ee233d
Daniel Nishi [Wed, 20 Jul 2016 23:52:59 +0000 (23:52 +0000)]
Merge "Update the Bluetooth pin pairing view to the new spec." into nyc-mr1-dev
Matthew Fritze [Wed, 20 Jul 2016 23:47:28 +0000 (23:47 +0000)]
Merge \"Error colors to point to frameworks instead of hard-coding them\" into nyc-mr1-dev
am:
d25148c8f7
Change-Id: Ia69404fbaad8485440b2f45f26820a70976bbf7d
Matthew Fritze [Wed, 20 Jul 2016 23:34:40 +0000 (23:34 +0000)]
Merge "Error colors to point to frameworks instead of hard-coding them" into nyc-mr1-dev
Daniel Nishi [Tue, 19 Jul 2016 19:41:46 +0000 (12:41 -0700)]
Update the Bluetooth pin pairing view to the new spec.
Bug:
30191613
Change-Id: Ib7b5f1758be0af33f6ea60d581a27df4801fc835
Tony Mak [Wed, 20 Jul 2016 19:26:54 +0000 (19:26 +0000)]
Merge \"Should not report unsuccessful attempt if pattern size < minimal size\" into nyc-mr1-dev
am:
9d83a9fbbb
Change-Id: I1f9f254baebab5b14fe298791e11887dbd4220c6
Tony Mak [Wed, 20 Jul 2016 19:20:54 +0000 (19:20 +0000)]
Merge "Should not report unsuccessful attempt if pattern size < minimal size" into nyc-mr1-dev
Abodunrinwa Toki [Wed, 20 Jul 2016 18:57:18 +0000 (18:57 +0000)]
Merge \"DO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation.\" into nyc-mr1-dev
am:
5af83786f7
Change-Id: I786b8815d0e928b7bb54a93e3fb633af1d206916
Doris Ling [Wed, 20 Jul 2016 18:51:17 +0000 (18:51 +0000)]
Merge \"Combine setCategories() and setSuggestions() in DashboardAdapter.\" into nyc-mr1-dev
am:
7e70fd1166
Change-Id: Id8f655e0a9b29369a57eea3c5140cf47def7cc36
Daniel Nishi [Wed, 20 Jul 2016 18:51:14 +0000 (18:51 +0000)]
Merge \"Add a help item for the Help & Feedback for the Storage Manager.\" into nyc-mr1-dev
am:
dd1c51a3e4
Change-Id: I80acbbc35e376f2e353aa955bfd66e4e2a63f71e
Abodunrinwa Toki [Wed, 20 Jul 2016 18:50:15 +0000 (18:50 +0000)]
Merge "DO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation." into nyc-mr1-dev
Michael Wright [Wed, 20 Jul 2016 18:49:59 +0000 (18:49 +0000)]
Merge \"Color transforms are now color modes.\" into nyc-mr1-dev
am:
111e1dc6b3
Change-Id: I6536baf47e102331fa87112d4f0b9d15ec432d2a
Doris Ling [Wed, 20 Jul 2016 18:02:42 +0000 (18:02 +0000)]
Merge "Combine setCategories() and setSuggestions() in DashboardAdapter." into nyc-mr1-dev
Daniel Nishi [Wed, 20 Jul 2016 17:33:40 +0000 (17:33 +0000)]
Merge "Add a help item for the Help & Feedback for the Storage Manager." into nyc-mr1-dev
TreeHugger Robot [Wed, 20 Jul 2016 17:21:33 +0000 (17:21 +0000)]
Merge "Color transforms are now color modes." into nyc-mr1-dev
Fan Zhang [Wed, 20 Jul 2016 17:00:04 +0000 (17:00 +0000)]
Merge \"Let talkback announce category name in Settings.\" into nyc-mr1-dev
am:
19d0f73c48
Change-Id: I612291219ec34682a50be2bae39a79c7bc320a36
TreeHugger Robot [Wed, 20 Jul 2016 16:51:13 +0000 (16:51 +0000)]
Merge "Let talkback announce category name in Settings." into nyc-mr1-dev
Bill Yi [Wed, 20 Jul 2016 14:45:00 +0000 (14:45 +0000)]
Import translations. DO NOT MERGE
am:
b5c2131de4 -s ours
Change-Id: I090280543af960bd345e2e7be70a8efd74de979a
Bill Yi [Wed, 20 Jul 2016 14:34:39 +0000 (07:34 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
30202203
Change-Id: Ieb3d22c6a8d1608dce6d9bce23d85f31a75be58a
Bill Yi [Wed, 20 Jul 2016 14:15:59 +0000 (14:15 +0000)]
Import translations. DO NOT MERGE
am:
708c6264ac -s ours
Change-Id: Icd36c43f8ba611bda0c1c88589cd7b1b86f6e716
Bill Yi [Wed, 20 Jul 2016 14:09:37 +0000 (07:09 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
30202203
Change-Id: I3fefeaaa89f3c3707b1e7c84c431689733547ca4
Jason Monk [Wed, 20 Jul 2016 13:33:57 +0000 (13:33 +0000)]
Merge \"Protect against work conditional crash\" into nyc-mr1-dev
am:
bd6a4f9066
Change-Id: I6072b6235abb35da9ecac1f41b01cf82e75d868b
Jason Monk [Wed, 20 Jul 2016 13:28:13 +0000 (13:28 +0000)]
Merge "Protect against work conditional crash" into nyc-mr1-dev
Tony Mak [Wed, 20 Jul 2016 08:55:25 +0000 (09:55 +0100)]
Should not report unsuccessful attempt if pattern size < minimal size
It is to align the behavior in personal side lock screen.
Change-Id: I811e72405615fbed85c2a4dc6b6cec51e4ad54f0
Fix:
30215101
Justin Klaassen [Wed, 20 Jul 2016 01:06:41 +0000 (01:06 +0000)]
Merge \"Add Night display settings conditional\" into nyc-mr1-dev
am:
b57ee0e02f
Change-Id: I72715ad005fade9376d036ebe7abfde0c89bd1e5
Fan Zhang [Wed, 20 Jul 2016 01:06:40 +0000 (01:06 +0000)]
Merge \"Add ripple effect on all preference tiles.\" into nyc-mr1-dev
am:
99da60a35f
Change-Id: I4b089e31df8dd95a4c08d2b845e82f55b522f680
TreeHugger Robot [Wed, 20 Jul 2016 01:00:23 +0000 (01:00 +0000)]
Merge "Add Night display settings conditional" into nyc-mr1-dev
TreeHugger Robot [Wed, 20 Jul 2016 00:49:37 +0000 (00:49 +0000)]
Merge "Add ripple effect on all preference tiles." into nyc-mr1-dev
Matthew Fritze [Tue, 19 Jul 2016 20:04:17 +0000 (13:04 -0700)]
Error colors to point to frameworks instead of hard-coding them
Rather than have each instance of the system error color hard code
the argb values, they now point to frameworks/base/core/res/.
Bug:
30021554
Change-Id: I6ec0512c5e69bc822810745b1745fa9feff95150
Fan Zhang [Tue, 19 Jul 2016 23:04:28 +0000 (16:04 -0700)]
Add ripple effect on all preference tiles.
Bug:
30201359
Change-Id: If02b7b08c05c23a4db3a0455ce12df31c4b7bf42
Daniel Nishi [Tue, 19 Jul 2016 22:47:10 +0000 (15:47 -0700)]
Add a help item for the Help & Feedback for the Storage Manager.
Bug:
29793176
Change-Id: Ic4104525961e7f173212df54f19857a06c0fac05
Andrew Sapperstein [Tue, 19 Jul 2016 21:52:38 +0000 (21:52 +0000)]
Merge \"Fix a bunch of straggler themes.\" into nyc-mr1-dev
am:
85902750a5
Change-Id: I975563cc36cd9d4011db01c227ef5f32d80e7fd7
Andrew Sapperstein [Tue, 19 Jul 2016 21:42:25 +0000 (21:42 +0000)]
Merge "Fix a bunch of straggler themes." into nyc-mr1-dev
Justin Klaassen [Tue, 19 Jul 2016 04:39:03 +0000 (21:39 -0700)]
Add Night display settings conditional
Bug:
30043281
Change-Id: I2464cd90f1f7f379aabf123f602e6150a87120cf
Mark Salyzyn [Thu, 7 Jul 2016 19:38:50 +0000 (12:38 -0700)]
Settings: trampoline persist.logd.logpersistd to logd.logpersistd
- Deal with trampoline, where we read logd.logpersistd and
logd.logpersistd.buffer, write to persist.logd.logpersistd and
persist.logd.logpersistd.buffer and logd.logpersistd*
- Deal with an as designed requirement that empty values do not
automatically trampoline, to properly communicate state.
- check logd.logpersistd.enable boolean for support
Bug:
28813587
Bug:
28936216
Bug:
29831823
Change-Id: Ib460ca90738ffdee17084349c1035701301c52bc
Mark Salyzyn [Thu, 7 Jul 2016 19:38:50 +0000 (12:38 -0700)]
Settings: add logpersist kernel only selection
Bug:
28813587
Bug:
28936216
Bug:
29831823
Change-Id: I9bfbb2717c2d4d39bfda6b92221a38985a4f4973
Mark Salyzyn [Fri, 3 Jun 2016 17:18:23 +0000 (10:18 -0700)]
Settings: add logpersist selection (actions)
- Only add logpersist menu if debuggable.
- Only enable logpersist menu if Logging is On.
- Add selection for Off, All and All minus radio.
- Pop up warning box that persistent storage is to be cleared when
selecting Off (but not if turned off by Logging Size Off or
Disabling Debugger Options).
Bug:
28813587
Bug:
28936216
Change-Id: Ic0a58abdcd6ca41069efb818d1dcef4e3927d2de
Jason Monk [Tue, 19 Jul 2016 20:54:06 +0000 (20:54 +0000)]
Merge \\"Pre-setup restrictions\\" into nyc-dev am:
5a3d1c17f2
am:
3b0bfee337
Change-Id: I590a980c4b747d02a7c97768784e7045aea2964f
Jason Monk [Tue, 19 Jul 2016 20:47:46 +0000 (20:47 +0000)]
Merge \\"Pre-setup restrictions\\" into nyc-dev am:
5a3d1c17f2
am:
69ce586155
Change-Id: I5e57fd8016f45d2bb863896aeee34c8786cf41f0
Jason Monk [Tue, 19 Jul 2016 20:40:35 +0000 (20:40 +0000)]
Merge \"Pre-setup restrictions\" into nyc-dev
am:
5a3d1c17f2
Change-Id: I58796967153f15fad0ba853fa428b191ecc08ed2
Jason Monk [Tue, 19 Jul 2016 20:39:18 +0000 (20:39 +0000)]
Merge \"Pre-setup restrictions\" into nyc-dev
am:
5a3d1c17f2
Change-Id: I0bc7e426b0dfc4d233b9caa263e5361f94dbf6f2
Doris Ling [Tue, 19 Jul 2016 20:35:42 +0000 (20:35 +0000)]
Merge \"Fix janky scrolling for Gestures Settings.\" into nyc-mr1-dev
am:
c2733db43f
Change-Id: I78b884c04ec6fa05fe7a6068260331d8451181cf
Jason Monk [Tue, 19 Jul 2016 20:31:15 +0000 (20:31 +0000)]
Merge "Pre-setup restrictions" into nyc-dev
Doris Ling [Tue, 19 Jul 2016 20:30:12 +0000 (20:30 +0000)]
Merge "Fix janky scrolling for Gestures Settings." into nyc-mr1-dev
Doris Ling [Tue, 19 Jul 2016 20:21:45 +0000 (20:21 +0000)]
Merge \"Add Gestures settings to search index.\" into nyc-mr1-dev
am:
bd3ac3bf22
Change-Id: I0d7aa14a24f496aba842d5b70176bc6f44c49c3b
Doris Ling [Tue, 19 Jul 2016 20:19:04 +0000 (20:19 +0000)]
Merge "Add Gestures settings to search index." into nyc-mr1-dev
Fan Zhang [Tue, 19 Jul 2016 19:35:06 +0000 (19:35 +0000)]
Merge \"Clarify string translation.\" into nyc-mr1-dev
am:
677cf28f6d
Change-Id: I8513be5787aeae513d44c17221f4b40beb15f92a
TreeHugger Robot [Tue, 19 Jul 2016 19:30:44 +0000 (19:30 +0000)]
Merge "Clarify string translation." into nyc-mr1-dev
Doris Ling [Tue, 19 Jul 2016 18:45:03 +0000 (11:45 -0700)]
Add Gestures settings to search index.
Add GestureSettings class to the resource map of
SearchIndeSearchIndexableResources so that the preferences in the
gestures settings will be indexed and showed up as search result.
Bug:
30169776
Change-Id: I51be9e82dc8bce93e2abd13b48ceb3cd051cbcf4
Jason Monk [Tue, 19 Jul 2016 18:22:14 +0000 (14:22 -0400)]
Protect against work conditional crash
Change-Id: Iba6e7281c622e3ba34fa6bd4672b2380b0329808
Fixes:
30014085
Fan Zhang [Tue, 19 Jul 2016 16:37:47 +0000 (09:37 -0700)]
Clarify string translation.
Bug:
30196308
Clarify ringtong volume string format and add an example.
Change-Id: I52769d5d274c7502f73ac25e8e1ce9ae6d0b87a5
Christopher Wiley [Tue, 19 Jul 2016 16:02:42 +0000 (16:02 +0000)]
Merge \"Do not use TetherUtil.setWifiTethering\" into nyc-mr1-dev
am:
62edbf484e
Change-Id: I023592acc146cbddb2917556a0fb7c3dade417f4
TreeHugger Robot [Tue, 19 Jul 2016 15:55:30 +0000 (15:55 +0000)]
Merge "Do not use TetherUtil.setWifiTethering" into nyc-mr1-dev
Jason Monk [Tue, 19 Jul 2016 14:33:16 +0000 (14:33 +0000)]
Merge \"Fix crash from dismissing after pause\" into nyc-mr1-dev
am:
8cb8dd05a2
Change-Id: I6ffd30d4c9dfa7e1c335a13495c1e7d823066c79
Jason Monk [Tue, 19 Jul 2016 14:28:50 +0000 (14:28 +0000)]
Merge "Fix crash from dismissing after pause" into nyc-mr1-dev
Bill Yi [Tue, 19 Jul 2016 09:56:23 +0000 (09:56 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
b2f60d2974 -s ours
Change-Id: Ib24f1486b64a2aa2588e0142ae671d3ba79c8232
TreeHugger Robot [Tue, 19 Jul 2016 09:49:06 +0000 (09:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Maurice Lam [Tue, 19 Jul 2016 01:47:34 +0000 (01:47 +0000)]
Merge \"Lock the orientation for FallbackHome\" into nyc-mr1-dev
am:
78626fadb4
Change-Id: Ic15676a02afb4c4acf1eacc3975415108ef2b99c
Maurice Lam [Tue, 19 Jul 2016 01:30:08 +0000 (01:30 +0000)]
Merge "Lock the orientation for FallbackHome" into nyc-mr1-dev
Doris Ling [Tue, 19 Jul 2016 01:05:06 +0000 (18:05 -0700)]
Fix janky scrolling for Gestures Settings.
1. Move the media player initialization/cleanup to construstor and
onDetach() of GesturePreference correspondingly, so that it's only
done once instead of every time when a new texture surface is available.
2. Pause the animation video when user scrolls.
Bug:
29790087
Change-Id: I51e6a787f9f2964b6bfc5288f7f5af801ccecc31
OSDN Git Service
