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
0bda6fb550
Merge "Fix return when virtual keyboard setting changes." into nyc-mr1-dev
2016-07-25 20:23:06 +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
e8bed6d959
Merge "Improve string comment" into nyc-mr1-dev
2016-07-25 18:12:00 +00:00
TreeHugger Robot
bcc18fa732
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-25 16:46:08 +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
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
53e9f35239
Merge "Add NightDisplaySettingsActivity" into nyc-mr1-dev
2016-07-22 21:55:59 +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
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
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
TreeHugger Robot
fd922cabd9
Merge "Get gestures animation preview image in async loader." into nyc-mr1-dev
2016-07-21 02:43:37 +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
Matthew Fritze
d739ea38fb
Merge "Revert "Revert "Error colors to point to frameworks instead of hard-coding them""" into nyc-mr1-dev
2016-07-21 01:04:26 +00:00
Matthew Fritze
892a54696b
Revert "Revert "Error colors to point to frameworks instead of hard-coding them""
...
This reverts commit f179f845e5
.
Change-Id: Ie57507b0d6ca76ba9b77836bc4e133f27a3664c7
2016-07-21 01:03:45 +00:00
Andrew Sapperstein
c49c496f1c
Merge "Revert "Error colors to point to frameworks instead of hard-coding them"" into nyc-mr1-dev
2016-07-21 00:57:02 +00:00
Matthew Fritze
f179f845e5
Revert "Error colors to point to frameworks instead of hard-coding them"
...
This reverts commit ae63c3db14
.
Change-Id: I2d3069eb5b23aa7df3fc1efc2eb085b493b5564c
2016-07-21 00:55:21 +00:00
Daniel Nishi
391f67e484
Merge "Update the Bluetooth pin pairing view to the new spec." into nyc-mr1-dev
2016-07-20 23:52:59 +00:00
Matthew Fritze
d25148c8f7
Merge "Error colors to point to frameworks instead of hard-coding them" into nyc-mr1-dev
2016-07-20 23:34:42 +00:00
Daniel Nishi
e8869e8a23
Update the Bluetooth pin pairing view to the new spec.
...
Bug: 30191613
Change-Id: Ib7b5f1758be0af33f6ea60d581a27df4801fc835
2016-07-20 14:17:42 -07:00
Tony Mak
9d83a9fbbb
Merge "Should not report unsuccessful attempt if pattern size < minimal size" into nyc-mr1-dev
2016-07-20 19:20:55 +00:00
Julia Reynolds
0bb60ada96
Display days of week in locale order.
...
Change-Id: Id5d5920089a5da1fbdc7802431ca2909f72d7e12
Fixes: 21304061
2016-07-20 15:15:16 -04:00
Abodunrinwa Toki
5af83786f7
Merge "DO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation." into nyc-mr1-dev
2016-07-20 18:50:16 +00:00
Doris Ling
7e70fd1166
Merge "Combine setCategories() and setSuggestions() in DashboardAdapter." into nyc-mr1-dev
2016-07-20 18:02:43 +00:00
Daniel Nishi
dd1c51a3e4
Merge "Add a help item for the Help & Feedback for the Storage Manager." into nyc-mr1-dev
2016-07-20 17:33:40 +00:00
TreeHugger Robot
111e1dc6b3
Merge "Color transforms are now color modes." into nyc-mr1-dev
2016-07-20 17:21:36 +00:00
TreeHugger Robot
19d0f73c48
Merge "Let talkback announce category name in Settings." into nyc-mr1-dev
2016-07-20 16:51:13 +00:00
Bill Yi
b5c2131de4
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 30202203
Change-Id: Ieb3d22c6a8d1608dce6d9bce23d85f31a75be58a
2016-07-20 07:34:39 -07:00
Bill Yi
708c6264ac
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 30202203
Change-Id: I3fefeaaa89f3c3707b1e7c84c431689733547ca4
2016-07-20 07:09:37 -07:00
Jason Monk
bd6a4f9066
Merge "Protect against work conditional crash" into nyc-mr1-dev
2016-07-20 13:28:13 +00:00
Tony Mak
818312d962
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
2016-07-20 09:55:25 +01:00
TreeHugger Robot
b57ee0e02f
Merge "Add Night display settings conditional" into nyc-mr1-dev
2016-07-20 01:00:25 +00:00