Makoto Onuki
a6a4dc70d2
Improve string comment am: 8e8bcb6900
...
am: 282e662b4e
2016-07-25 18:36:22 +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
0c2a71c18a
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: bcc18fa732 -s ours
...
am: bab8334482
2016-07-25 17:23:16 +00:00
Bill Yi
82a6d3bcba
Import translations. DO NOT MERGE am: 4f77347f7d -s ours
...
am: df340e3bf2
2016-07-25 17:23:14 +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
49fb55f1f1
Merge "Import translations. DO NOT MERGE"
2016-07-25 16:48:02 +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
be6bdc9306
Add non-transparent background to dashboard items. am: 6b75a69195
...
am: 478c57eba2
2016-07-25 16:35:39 +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
Robin Lee
e68d957777
Include wifi certificates in settings
...
Deleting wifi certificates isn't supported yet since cascading the
removal back into wifi configs will need some easy way of enumerating
wifi configs first.
Bug: 29208062
Change-Id: I2d9d1ea7e0974701009bfa6ea162b8bc80806639
2016-07-25 15:35:08 +01: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
Bill Yi
cfd8cee323
Import translations. DO NOT MERGE
...
Change-Id: I97c5e8e2c638eeaf9348d0319cc16a4955a7f6bc
Auto-generated-cl: translation import
2016-07-25 06:45:37 -07:00
Svetoslav Ganov
b06766f129
Add Bluetooth toggle prompts - settings
...
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
bug:28715749
Change-Id: I5ae0c532c92b2c05a91f0d769ca6744002747fca
2016-07-22 20:08:44 -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
14349303d7
Merge \\"Fix scroll issue when going from Display->Ambient Display to Moves.\\" into nyc-mr1-dev am: 0fd853ad66
...
am: 83b3647e0c
2016-07-22 22:25:36 +00:00
Doris Ling
3075171f13
Fix scroll issue when going from Display->Ambient Display to Moves. am: 2f92d751e0
...
am: f6578b733c
2016-07-22 22:25:36 +00: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
Justin Klaassen
b8b730044c
Merge \\"Add NightDisplaySettingsActivity\\" into nyc-mr1-dev am: 53e9f35239
...
am: f4f56407c3
2016-07-22 22:15:48 +00:00
Justin Klaassen
788dbf7dd2
Add NightDisplaySettingsActivity am: eae3d9f932
...
am: 478dec45ce
2016-07-22 22:15:47 +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
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
