Fan Zhang
942e24d46f
Revert \"About Phone\" summary back to Android version.
...
am: fd4f729e1f
2016-07-25 23:08:17 +00:00
Fan Zhang
a988f59ce8
Merge \"Refresh state after loading conditions from xml.\" into nyc-mr1-dev
...
am: 58e217b180
2016-07-25 23:08:15 +00:00
Fan Zhang
91a1c1cad0
Refresh state after loading conditions from xml.
...
am: a0ebd1a9f0
2016-07-25 23:08:14 +00:00
Jeff Sharkey
4f425c890b
Offer trampoline to help articles.
...
This allows other parts of the system internals to re-use common
logic for building help links, and it allows all help links to live
in a single common overlay.
Adds a help link slot for "Android is upgrading" notification.
Bug: 30033319, 30122837
Change-Id: I7dec3e63cfb8c7a8ee9a562cc61cb70f3f99fdae
2016-07-25 16:45:15 -06:00
Fan Zhang
2dc574e59a
Merge "Revert "About Phone" summary back to Android version." into nyc-mr1-dev
2016-07-25 22:13:27 +00:00
Fan Zhang
58e217b180
Merge "Refresh state after loading conditions from xml." into nyc-mr1-dev
2016-07-25 22:13:17 +00:00
Fan Zhang
fd4f729e1f
Revert "About Phone" summary back to Android version.
...
Change-Id: Icc834b8fb1fd9235092cee720c904c8532b8e3fc
Fixes: 30355258
Bug: 28419411
2016-07-25 14:22:00 -07:00
Doris Ling
0d4b8a3b19
Fix crash when support item is clicked.
...
Check for existing activity to handle the support item intent before
adding it to support tile or trying to launch the activity.
Change-Id: I42a733c2d862b303773aeee1ba3b21b718e59066
Fixes: 29118295
2016-07-25 14:06:42 -07:00
Fan Zhang
a0ebd1a9f0
Refresh state after loading conditions from xml.
...
Fixes: 30330909
When start Settings, conditions is loaded from a xml with potentially
stale state. ConditionLoader needs to refresh states after reading xml
to make sure they are up to date.
Change-Id: Ice1b8bacb0486c5dd230b83670c1494710d1c061
2016-07-25 13:58:39 -07:00
Phil Weaver
a1ef5a8590
Merge \"Fix return when virtual keyboard setting changes.\" into nyc-mr1-dev
...
am: 0bda6fb550
2016-07-25 20:34:42 +00:00
Phil Weaver
fc3352e585
Fix return when virtual keyboard setting changes.
...
am: 3587914cef
2016-07-25 20:34:41 +00:00
Phil Weaver
0bda6fb550
Merge "Fix return when virtual keyboard setting changes." into nyc-mr1-dev
2016-07-25 20:23:06 +00:00
Jason Monk
d50e012545
Merge \"Fix multiple bluetooth devices bug\" into nyc-mr1-dev
...
am: d5b3043bba
2016-07-25 19:19:19 +00:00
Jason Monk
5129b26123
Fix multiple bluetooth devices bug
...
am: 6666f9cc37
2016-07-25 19:19:19 +00:00
Jason Monk
d5b3043bba
Merge "Fix multiple bluetooth devices bug" into nyc-mr1-dev
2016-07-25 18:35:57 +00:00
Makoto Onuki
eb29897252
Merge \"Improve string comment\" into nyc-mr1-dev
...
am: e8bed6d959
2016-07-25 18:32:18 +00:00
Makoto Onuki
282e662b4e
Improve string comment
...
am: 8e8bcb6900
2016-07-25 18:32:17 +00:00
Makoto Onuki
e8bed6d959
Merge "Improve string comment" into nyc-mr1-dev
2016-07-25 18:12:00 +00:00
Bill Yi
bab8334482
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
...
am: bcc18fa732
2016-07-25 17:03:33 +00:00
Bill Yi
df340e3bf2
Import translations. DO NOT MERGE
...
am: 4f77347f7d
2016-07-25 17:03:32 +00:00
TreeHugger Robot
bcc18fa732
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-25 16:46:08 +00:00
Fan Zhang
478c57eba2
Add non-transparent background to dashboard items.
...
am: 6b75a69195
2016-07-25 16:13:25 +00:00
Jason Monk
6666f9cc37
Fix multiple bluetooth devices bug
...
Was bug in some code trying to handle preference animations better.
Since those animations are all disabled now, just remove everything
again and re-add it.
Change-Id: If1ce07a8f2b4144d95a95cec6ebb1b423644825a
Fixes: 29314480
2016-07-25 10:37:39 -04:00
Bill Yi
4f77347f7d
Import translations. DO NOT MERGE
...
Change-Id: I460a8a0f711298b1658451774c021e8d4a3d2087
Auto-generated-cl: translation import
2016-07-25 07:34:40 -07:00
Fan Zhang
6b75a69195
Add non-transparent background to dashboard items.
...
Bug: 30297664
Change-Id: Ia6173e8b0d5852a1c454ae466886f894c72e3e5f
2016-07-22 17:14:48 -07:00
Doris Ling
83b3647e0c
Merge \"Fix scroll issue when going from Display->Ambient Display to Moves.\" into nyc-mr1-dev
...
am: 0fd853ad66
2016-07-22 22:18:16 +00:00
Doris Ling
f6578b733c
Fix scroll issue when going from Display->Ambient Display to Moves.
...
am: 2f92d751e0
2016-07-22 22:18:15 +00:00
Doris Ling
0fd853ad66
Merge "Fix scroll issue when going from Display->Ambient Display to Moves." into nyc-mr1-dev
2016-07-22 22:14:01 +00:00
Justin Klaassen
f4f56407c3
Merge \"Add NightDisplaySettingsActivity\" into nyc-mr1-dev
...
am: 53e9f35239
2016-07-22 22:07:46 +00:00
Justin Klaassen
478dec45ce
Add NightDisplaySettingsActivity
...
am: eae3d9f932
2016-07-22 22:07:06 +00:00
Justin Klaassen
53e9f35239
Merge "Add NightDisplaySettingsActivity" into nyc-mr1-dev
2016-07-22 21:55:59 +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
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
2bf9591d92
Don\'t allow changing data usage setting if uid is not app.
...
am: 2a84bbcddb
2016-07-22 20:11:11 +00:00
Yoshinori Hirano
2ce843b00e
Show summary of "Add user" item
...
The summary of "Add user" item is not displayed.
To show it, useAdminDisabledSummary should be false.
Bug: 30005296
Change-Id: Ia33cab4d671f42bd971acbf5523da1c4d21948e1
2016-07-22 20:09:28 +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
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
