Anna Galusza
a83ee331b2
Merge \\"Fix font and display size settings pages for small screens.\\" into nyc-mr1-dev am: bbb844f94d
...
am: 2ab7eed703
2016-07-22 21:16:25 +00:00
Anna Galusza
2ac90ce6bf
Fix font and display size settings pages for small screens. am: 798b35ac09
...
am: c3c3d0fb44
2016-07-22 21:16:25 +00:00
Anna Galusza
2ab7eed703
Merge \"Fix font and display size settings pages for small screens.\" into nyc-mr1-dev
...
am: bbb844f94d
2016-07-22 21:13:16 +00:00
Anna Galusza
c3c3d0fb44
Fix font and display size settings pages for small screens.
...
am: 798b35ac09
2016-07-22 21:13:16 +00:00
Anna Galusza
bbb844f94d
Merge "Fix font and display size settings pages for small screens." into nyc-mr1-dev
2016-07-22 21:09:35 +00:00
Daniel Nishi
4a184d4360
Add a dropdown for changing the days of retained downloads.
...
Bug: 30304998
Change-Id: I3113d58313a4badff55f79988abd7612d3bb4da5
2016-07-22 14:02:52 -07:00
Doris Ling
2f92d751e0
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
2016-07-22 13:28:21 -07:00
Fan Zhang
3f86f04796
Don\\'t allow changing data usage setting if uid is not app. am: 2a84bbcddb
...
am: 2bf9591d92
2016-07-22 20:13:43 +00:00
Fan Zhang
2bf9591d92
Don\'t allow changing data usage setting if uid is not app.
...
am: 2a84bbcddb
2016-07-22 20:11:11 +00:00
Anna Galusza
798b35ac09
Fix font and display size settings pages for small screens.
...
This was particularly broken in split-screen mode.
Bug: 29835212
Change-Id: I141f659e2d2d282d5af1ae97d6c798e53f71f766
2016-07-22 20:06:42 +00:00
Justin Klaassen
eae3d9f932
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
2016-07-22 19:40:17 +00:00
Fan Zhang
2a84bbcddb
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
2016-07-22 10:07:12 -07:00
Doris Ling
dd0f8ca8aa
Merge \\"Check for null activity before getting dashboard categories.\\" into nyc-mr1-dev am: 7b03ae69df
...
am: 8847c70b61
2016-07-22 01:47:53 +00:00
Doris Ling
4a6f8b967a
Check for null activity before getting dashboard categories. am: b7e650c6f7
...
am: 4ec4b64b9d
2016-07-22 01:47:12 +00:00
Fan Zhang
068ed43d0d
Fix crash when starting Settings -> Display -> Font size am: cafe6972a9
...
am: 2ef88c5c11
2016-07-22 01:47:11 +00:00
Sunny Goyal
fe4df9fc35
Merge \\"Updating the shortcut icons for Settings app\\" into nyc-mr1-dev am: fe9bf6d9d1
...
am: f00a2babd9
2016-07-22 01:47:11 +00:00
Sunny Goyal
bb176aa30d
Updating the shortcut icons for Settings app am: b67291a274
...
am: b828370049
2016-07-22 01:47:10 +00:00
Bill Yi
830fcdc7e1
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 2ece9e4894 -s ours
...
am: 7e2d253106
2016-07-22 01:47:09 +00:00
Bill Yi
e3ce65020a
Import translations. DO NOT MERGE am: 1dc5c8bcbf -s ours
...
am: cd2e8c4cda
2016-07-22 01:45:57 +00:00
Thierry Strudel
5276e46916
Merge changes from topic \\'enable_persist_kernel_log\\' into nyc-mr1-dev am: 8f3c7dd719
...
am: 3a06792cc6
2016-07-22 01:45:56 +00:00
Mark Salyzyn
d5c877a4cf
Settings: trampoline persist.logd.logpersistd to logd.logpersistd am: bdbd2d984e
...
am: 37f2668eac
2016-07-22 01:45:55 +00:00
Mark Salyzyn
35f9ccc483
Settings: add logpersist kernel only selection am: 78dd2e2c74
...
am: b5ba827dbb
2016-07-22 01:45:54 +00:00
Mark Salyzyn
693bd64235
Settings: add logpersist selection (actions) am: c8b1c3ec22 -s ours
...
am: 3aee719c59
2016-07-22 01:45:53 +00:00
Doris Ling
8847c70b61
Merge \"Check for null activity before getting dashboard categories.\" into nyc-mr1-dev
...
am: 7b03ae69df
2016-07-22 01:42:47 +00:00
Doris Ling
4ec4b64b9d
Check for null activity before getting dashboard categories.
...
am: b7e650c6f7
2016-07-22 01:42:47 +00:00
Fan Zhang
2ef88c5c11
Fix crash when starting Settings -> Display -> Font size
...
am: cafe6972a9
2016-07-22 01:42:45 +00:00
Sunny Goyal
f00a2babd9
Merge \"Updating the shortcut icons for Settings app\" into nyc-mr1-dev
...
am: fe9bf6d9d1
2016-07-22 01:42:44 +00:00
Sunny Goyal
b828370049
Updating the shortcut icons for Settings app
...
am: b67291a274
2016-07-22 01:42:44 +00:00
Bill Yi
7e2d253106
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
...
am: 2ece9e4894
2016-07-22 01:42:42 +00:00
Bill Yi
cd2e8c4cda
Import translations. DO NOT MERGE
...
am: 1dc5c8bcbf
2016-07-22 01:42:42 +00:00
Mark Salyzyn
3a06792cc6
Merge changes from topic \'enable_persist_kernel_log\' into nyc-mr1-dev
...
am: 8f3c7dd719
2016-07-22 01:41:49 +00:00
Mark Salyzyn
37f2668eac
Settings: trampoline persist.logd.logpersistd to logd.logpersistd
...
am: bdbd2d984e
2016-07-22 01:40:55 +00:00
Mark Salyzyn
b5ba827dbb
Settings: add logpersist kernel only selection
...
am: 78dd2e2c74
2016-07-22 01:40:24 +00:00
Mark Salyzyn
3aee719c59
Settings: add logpersist selection (actions)
...
am: c8b1c3ec22
2016-07-22 01:39:52 +00:00
Doris Ling
7b03ae69df
Merge "Check for null activity before getting dashboard categories." into nyc-mr1-dev
2016-07-21 20:58:22 +00:00
Fan Zhang
cafe6972a9
Fix crash when starting Settings -> Display -> Font size
...
Change-Id: I26f81d02e31b0b7c8120395231aa6b81be6be7be
Fixes: 30279736
2016-07-21 13:30:54 -07:00
Doris Ling
b7e650c6f7
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
2016-07-21 12:22:17 -07:00
Sunny Goyal
fe9bf6d9d1
Merge "Updating the shortcut icons for Settings app" into nyc-mr1-dev
2016-07-21 18:27:33 +00:00
Sunny Goyal
b67291a274
Updating the shortcut icons for Settings app
...
Bug: 30224034
Bug: 30280907
Change-Id: I6ebf85dbf2941c1cf55e443d611655cdb765da66
2016-07-21 11:26:52 -07:00
Makoto Onuki
8e8bcb6900
Improve string comment
...
Bug 30210359
Bug 30207992
Change-Id: I27f8166b4fbd8f3b3e01c71e1fcc114c2a713231
2016-07-21 10:35:47 -07:00
TreeHugger Robot
2ece9e4894
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-21 04:32:48 +00:00
Thierry Strudel
8f3c7dd719
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)
2016-07-21 04:07:25 +00:00
Bill Yi
1dc5c8bcbf
Import translations. DO NOT MERGE
...
Change-Id: I2135a4c00d05ba973eae29159fa7ab87d4dc8bd4
Auto-generated-cl: translation import
2016-07-20 20:05:32 -07:00
Doris Ling
c74d8368e7
Merge \\"Get gestures animation preview image in async loader.\\" into nyc-mr1-dev am: fd922cabd9
...
am: 8668aa0a8f
2016-07-21 02:49:41 +00:00
Doris Ling
8668aa0a8f
Merge \"Get gestures animation preview image in async loader.\" into nyc-mr1-dev
...
am: fd922cabd9
2016-07-21 02:47:12 +00:00
TreeHugger Robot
fd922cabd9
Merge "Get gestures animation preview image in async loader." into nyc-mr1-dev
2016-07-21 02:43:37 +00:00
Matthew Fritze
53b782d1bf
Merge \\"Revert \\"Revert \\"Error colors to point to frameworks instead of hard-coding them\\"\\"\\" into nyc-mr1-dev am: d739ea38fb
...
am: 1da5d326a1
2016-07-21 01:38:22 +00:00
Matthew Fritze
71368b83b8
resolve merge conflicts of 21b446c to master
...
Change-Id: I38d1f88f03505d690ccd1739c42e8d34ef87890f
2016-07-20 18:28:39 -07:00
Matthew Fritze
1da5d326a1
Merge \"Revert \"Revert \"Error colors to point to frameworks instead of hard-coding them\"\"\" into nyc-mr1-dev
...
am: d739ea38fb
2016-07-21 01:24:09 +00:00
Doris Ling
de991f457d
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
2016-07-20 18:13:55 -07:00
