Mark Salyzyn
1f9e0cce2b
Merge \\"Settings: add logpersist selection (strings)\\" am: 99afd4a87d
...
am: 540ebc39ac
2016-06-09 20:18:14 +00:00
Mark Salyzyn
540ebc39ac
Merge \"Settings: add logpersist selection (strings)\"
...
am: 99afd4a87d
2016-06-09 19:46:46 +00:00
Mark Salyzyn
99afd4a87d
Merge "Settings: add logpersist selection (strings)"
2016-06-09 19:38:32 +00:00
Mark Salyzyn
954ed57091
Settings: add logpersist selection (strings)
...
Strings for selecting between Off, All and All minus radio to
store logs persistently on the local eMMC device. Strings for
warning button when erasing logpersist data.
Bug: 28936216
Change-Id: I3aaa59a6ebbe1a695490b4a72cad2c807c048985
2016-06-09 19:37:34 +00:00
Bill Yi
9190e13af2
Import translations. DO NOT MERGE
...
am: b43b49c643
2016-06-09 14:00:04 +00:00
Bill Yi
b43b49c643
Import translations. DO NOT MERGE
...
Change-Id: I7b3039eadee367f4839682567022826320d208e0
Auto-generated-cl: translation import
2016-06-08 22:38:29 -07:00
Jason Monk
feee247e0c
Fix build
...
Change-Id: I264b0d9507e62ad5a2debad663faedd549414012
(cherry picked from commit e3ce6713d3
2016-06-08 21:29:48 +00:00
Jason Monk
167f6cc87c
Merge \"Remove PreferenceActivity\" into nyc-dev
...
am: 7f7092c705
2016-06-08 19:15:42 +00:00
Jason Monk
2c7e1d844f
Merge \"Fix data usage format strings\" into nyc-dev
...
am: cb1972b908
2016-06-08 19:15:42 +00:00
Jason Monk
4db5484a9d
Merge \"Fix disabling of tiles that are not relevant\" into nyc-dev
...
am: 9c5d3164f5
2016-06-08 19:15:41 +00:00
Jason Monk
7f7092c705
Merge "Remove PreferenceActivity" into nyc-dev
2016-06-08 19:13:05 +00:00
Jason Monk
cb1972b908
Merge "Fix data usage format strings" into nyc-dev
2016-06-08 19:11:51 +00:00
Jason Monk
9c5d3164f5
Merge "Fix disabling of tiles that are not relevant" into nyc-dev
2016-06-08 19:10:09 +00:00
Ricky Wai
263b210c16
Merge \"Make work challenge settings work even work profile is not enabled yet\" into nyc-dev
...
am: 68c263cf2e
2016-06-08 14:47:43 +00:00
Ricky Wai
68c263cf2e
Merge "Make work challenge settings work even work profile is not enabled yet" into nyc-dev
2016-06-08 14:34:02 +00:00
Jason Monk
b7e4380cd2
Remove PreferenceActivity
...
Its broken and isn't worth maintaining, instead port the few things
using it over to SettingsPreferenceActivity with wrapping blank
Activities like the rest of Settings.
Change-Id: Ic82f0dcb63ed9b4078f7da6a79c0c52f0130e8d1
Fixes: 28779941
2016-06-08 09:48:58 -04:00
Baligh Uddin
edb4c9c153
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: 09cedc44b4
2016-06-08 13:36:05 +00:00
Ricky Wai
7250016447
Make work challenge settings work even work profile is not enabled yet
...
Bug: 29090660
Change-Id: I21996700f1ee451e8420f3f257c6ed51feea4ecb
2016-06-08 13:33:57 +00:00
Baligh Uddin
09cedc44b4
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-08 13:09:21 +00:00
Baligh Uddin
013581c95e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29169863
Change-Id: Ibe6c3ae08e13bc4984932908f9a3ae2ca632b26c
2016-06-07 21:21:26 -07:00
Jim Miller
6233c1d0bc
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
...
am: f8c64089b1
2016-06-08 00:38:35 +00:00
TreeHugger Robot
f8c64089b1
Merge "Move legacy full disk encryption code to Settings." into nyc-dev
2016-06-08 00:31:30 +00:00
Jim Miller
358ff29f38
Move legacy full disk encryption code to Settings.
...
Fixes bug 27617297
Change-Id: Ib975cf8d4f2e1e7fa8a77550ca4ee8233647e9db
2016-06-07 15:44:46 -07:00
Jason Monk
5862c1ef02
Fix disabling of tiles that are not relevant
...
- Fix restricted user tiles being disabled
- Call new better method in SettingsDrawerActivity for disabling
Change-Id: I2fb6ddd3d505189d2b6d96c0a1039291b80a2f70
Fixes: 29080209
2016-06-07 14:02:33 -04:00
Bill Yi
f12e2ee361
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 48229d7781
2016-06-07 03:31:23 +00:00
TreeHugger Robot
48229d7781
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-07 03:23:12 +00:00
Bill Yi
d4bd56b2a7
Import translations. DO NOT MERGE
...
Change-Id: I1f567719e29fcdea3acf79df2b310301f948befb
Auto-generated-cl: translation import
2016-06-06 18:48:05 -07:00
Robin Lee
cff703e68a
Merge "Restrict Settings always-on to NYC+" into nyc-dev
...
am: 8f2c17e12c
2016-06-06 21:09:29 +00:00
Robin Lee
8f2c17e12c
Merge "Restrict Settings always-on to NYC+" into nyc-dev
2016-06-06 20:59:01 +00:00
Jason Monk
aa5a8a6a4c
Fix data usage format strings
...
Bug: 28747101
Change-Id: I5be9bb7ce3b11709117da698d6c03610f4e5e40e
2016-06-06 16:39:55 -04:00
Robin Lee
cfc0fb02c1
Restrict Settings always-on to NYC+
...
Bug: 28413917
Change-Id: I1c40bdc94bb05d21daf589840adbbf04abe6c10f
2016-06-06 17:04:36 +00:00
Bill Yi
e2b9a2bd87
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: edafefc1ed
2016-06-03 21:08:44 +00:00
Jason Monk
2cd2074f7f
Merge "Fix accidental non-translatable string" into nyc-dev
...
am: 8c5dccc6bf
2016-06-03 21:06:10 +00:00
TreeHugger Robot
edafefc1ed
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-03 19:22:57 +00:00
Jason Monk
8c5dccc6bf
Merge "Fix accidental non-translatable string" into nyc-dev
2016-06-03 19:12:09 +00:00
Jason Monk
18b603f84f
Fix accidental non-translatable string
...
Bug: 29034697
Change-Id: If45ef25db1d23fd2ce83ca3119fa63c0ebbcdead
2016-06-03 15:06:56 -04:00
Sanket Agarwal
083ba3cc2a
Merge "Handle return value when Bluetooth is enabled" am: cc889f6b92
...
am: e1fa67c165
2016-06-03 18:01:45 +00:00
Sanket Agarwal
e1fa67c165
Merge "Handle return value when Bluetooth is enabled"
...
am: cc889f6b92
2016-06-03 17:51:28 +00:00
Treehugger Robot
cc889f6b92
Merge "Handle return value when Bluetooth is enabled"
2016-06-03 17:42:38 +00:00
Sudheer Shanka
7469d799a8
Merge "Avoid triggering device admin settings in non-current user." into nyc-dev
...
am: a433fd2429
2016-06-03 17:13:09 +00:00
Bill Yi
73642fd30c
Import translations. DO NOT MERGE
...
Change-Id: Iafa80717a736b94e0ef1ccd8eaa42b61379349e2
Auto-generated-cl: translation import
2016-06-03 10:09:43 -07:00
TreeHugger Robot
a433fd2429
Merge "Avoid triggering device admin settings in non-current user." into nyc-dev
2016-06-03 17:02:51 +00:00
Makoto Onuki
a8a8167ebb
Fix RTL layout
...
am: 3a87050921
2016-06-03 15:33:57 +00:00
Sanket Agarwal
3d06893ba6
Handle return value when Bluetooth is enabled
...
If the Bluetooth enable(true) returns false currently we are waiting for
a broadcast (which may not happen if enable returns false). We mark the
toggle to have failed (i.e. it is clickable and in OFF state) and the
switch bar text is appropriately shown.
Bug: b/28318203
Change-Id: I09ba46d2e102e7f2c4ef9a72bf38dedc1346364f
2016-06-03 01:07:24 +00:00
Makoto Onuki
3a87050921
Fix RTL layout
...
Bug 29072224
Change-Id: I414d868b4256e034850a873511bf34d9430842dc
2016-06-02 17:52:17 -07:00
Fyodor Kupolov
06a9c98bb8
Merge "Make prefs without an action unselectable" into nyc-dev
...
am: 9121169dca
2016-06-02 22:44:44 +00:00
Fyodor Kupolov
9121169dca
Merge "Make prefs without an action unselectable" into nyc-dev
2016-06-02 22:30:22 +00:00
Sudheer Shanka
8b72e563ec
Avoid triggering device admin settings in non-current user.
...
Bug: 28953755
Change-Id: Ic9f6f57b1ef4cc1de2d1ea227b17faf4334ffec8
2016-06-02 12:40:22 -07:00
Fyodor Kupolov
77865ec827
Make prefs without an action unselectable
...
Setting selectable=false is required for proper A11y. Otherwise Talkback
will inform the user that the item can be activated.
Bug: 29025567
Change-Id: I2b61c622c2d69fa83640f7822349613f51f849d5
2016-06-02 10:39:33 -07:00
Wei Wang
704476a96d
Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev
...
am: d0d3ca3b7c
2016-06-02 17:22:59 +00:00
