Alan Viverette
c61aabfa22
Merge "Update material colors" into lmp-dev
2014-08-25 23:18:34 +00:00
Alan Viverette
4895df355a
Update material colors
...
BUG: 17212898
Change-Id: Idb1c391de3c1fb150f06c3cf744780be1404d2e5
2014-08-25 16:05:50 -07:00
Amith Yamasani
3391321e2f
Fix toggle button clickability in app restrictions
...
Also fix side padding
Bug: 17159406
Change-Id: Ic1d61d9a4a7ae6f3f7c451405a6e127791edbdaf
2014-08-25 15:20:34 -07:00
PauloftheWest
3aeb60dc58
am 687d3a58: am 87d8074a: am aa5c7565: Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev
...
* commit '687d3a589ea6a9a259454ea7e139143d4d988f91':
Updated Tethering and portable hotspot to use switches.
2014-08-25 17:18:52 +00:00
PauloftheWest
87d8074a14
am aa5c7565: Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev
...
* commit 'aa5c7565e42efdfa5ae5506a0a9dfd4f05461034':
Updated Tethering and portable hotspot to use switches.
2014-08-25 16:55:21 +00:00
PauloftheWest
aa5c7565e4
Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev
2014-08-25 16:44:25 +00:00
Baligh Uddin
cef6b220d6
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-08-25 16:21:03 +00:00
PauloftheWest
656c88cb71
Updated Tethering and portable hotspot to use switches.
...
Bug: 17020102
Change-Id: I5da1745d4ea9545f8960c015ca6858fb0a34de0d
2014-08-25 08:45:05 -07:00
Dianne Hackborn
6a6d1d7ee5
am 6d98f8e1: am b1391d84: am c436b159: Merge "Tweak voice settings strings." into lmp-dev
...
* commit '6d98f8e1cbe23348c43a981d37d6b75fcfe99867':
Tweak voice settings strings.
2014-08-25 08:25:08 +00:00
Amith Yamasani
b5ba4afdca
am cb7b83de: am 77287101: am 8fe71068: Merge "Don\'t index the ChooseLockGeneric screen" into lmp-dev
...
* commit 'cb7b83de42b13b55030f5d0207f42fcc9e346968':
Don't index the ChooseLockGeneric screen
2014-08-25 08:24:10 +00:00
Baligh Uddin
aea96bdfb0
Import translations. DO NOT MERGE
...
Change-Id: Ib13840b4fe07abc8aba474a3b0abf4b06fdb4405
Auto-generated-cl: translation import
2014-08-24 13:07:11 -07:00
Dianne Hackborn
b1391d84fe
am c436b159: Merge "Tweak voice settings strings." into lmp-dev
...
* commit 'c436b159534240c64281447860a81e519bf7c07d':
Tweak voice settings strings.
2014-08-24 18:59:46 +00:00
Dianne Hackborn
c436b15953
Merge "Tweak voice settings strings." into lmp-dev
2014-08-24 18:53:17 +00:00
Dianne Hackborn
7912a76cd2
Tweak voice settings strings.
...
Change-Id: I4cb6badaf2d013d43d87bc8ecdc0763c4e5d6b50
2014-08-23 14:11:12 -07:00
Selim Gurun
b56bab1fd4
Use GoogleSetting to override DRP setting if available
...
Bug: 12492817
The developer setting will be deprecated and eventually will be
removed after the setting is moved to its new location.
This is the prep work for it.
Change-Id: If0b019b33a544b7d2e659161685fa33ca052f612
2014-08-23 08:32:09 -07:00
Amith Yamasani
7728710183
am 8fe71068: Merge "Don\'t index the ChooseLockGeneric screen" into lmp-dev
...
* commit '8fe710682ad3f5a5ac0ed1393f3d934bea122bc5':
Don't index the ChooseLockGeneric screen
2014-08-23 01:21:51 +00:00
Amith Yamasani
8fe710682a
Merge "Don't index the ChooseLockGeneric screen" into lmp-dev
2014-08-23 01:07:03 +00:00
Jim Miller
c35e4fafa3
am 0c5fdd10: am 86e9f7cd: am 1351b0fb: Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev
...
* commit '0c5fdd10dedf7c3671d19addcea270ed945b92d1':
Show trust agent entries as disabled rather than removing them.
2014-08-22 22:54:40 +00:00
Amith Yamasani
644907a86f
Don't index the ChooseLockGeneric screen
...
This avoids indexing face unlock, which may not always exist or might
be disabled by policy.
Instead, add some of the relevant keywords up one level in Security
settings.
Bug: 17185326
Change-Id: I4fbae1c0384a97383707104a6fe283075edbf341
2014-08-22 15:38:16 -07:00
Jim Miller
86e9f7cd66
am 1351b0fb: Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev
...
* commit '1351b0fbcddea9cc66941e8af1de148142b92201':
Show trust agent entries as disabled rather than removing them.
2014-08-22 22:34:45 +00:00
Jim Miller
1351b0fbcd
Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev
2014-08-22 22:25:16 +00:00
Baligh Uddin
3f2be99c1d
Merge "Import translations. DO NOT MERGE"
2014-08-22 17:24:32 +00:00
Baligh Uddin
3723625fec
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-08-22 17:24:31 +00:00
Jessica Hummel
da277ed6e3
am 6c86560c: am 1da99d2b: am 2e9e044e: Final tweaks to work profile strings
...
* commit '6c86560cad3fc0ab1d198ba3a429f9cb79b15f99':
Final tweaks to work profile strings
2014-08-22 15:01:59 +00:00
Jessica Hummel
1da99d2b45
am 2e9e044e: Final tweaks to work profile strings
...
* commit '2e9e044ed2c3dbbcd7ce01d2c8b6e00f452cf31b':
Final tweaks to work profile strings
2014-08-22 14:42:05 +00:00
Jessica Hummel
2e9e044ed2
Final tweaks to work profile strings
...
Change-Id: Icd8f3ac2e8e3fb7f0368cdf40bcd42b4f275258b
bug:15744182
2014-08-22 14:06:30 +00:00
Alexandra Gherghina
4810f9b49d
am 61d33eb7: am 70a7c59d: am 9239d6d0: Merge "Update strings for removing work profile" into lmp-dev
...
* commit '61d33eb7b7c4a38e4d53e2de5425f1594715f3fd':
Update strings for removing work profile
2014-08-22 13:21:01 +00:00
Alexandra Gherghina
0e895c675e
am 6db44b35: am dfe2f709: am 9c4d5dd8: Merge "Modify Spinner so that the arrow is closer to the text" into lmp-dev
...
* commit '6db44b35db9636c752004597d2148f36984966bf':
Modify Spinner so that the arrow is closer to the text
2014-08-22 13:21:00 +00:00
Alexandra Gherghina
70a7c59daa
am 9239d6d0: Merge "Update strings for removing work profile" into lmp-dev
...
* commit '9239d6d0a2fd01170b6188a6b92bd716ca962c65':
Update strings for removing work profile
2014-08-22 13:01:59 +00:00
Alexandra Gherghina
dfe2f709c6
am 9c4d5dd8: Merge "Modify Spinner so that the arrow is closer to the text" into lmp-dev
...
* commit '9c4d5dd86b250dbb0ce9fe5dc9339a7fd7798981':
Modify Spinner so that the arrow is closer to the text
2014-08-22 13:01:58 +00:00
Alexandra Gherghina
9239d6d0a2
Merge "Update strings for removing work profile" into lmp-dev
2014-08-22 12:53:29 +00:00
Alexandra Gherghina
9c4d5dd86b
Merge "Modify Spinner so that the arrow is closer to the text" into lmp-dev
2014-08-22 12:53:19 +00:00
Alexandra Gherghina
4c96267acd
Update strings for removing work profile
...
Bug: 17139301
Change-Id: I524946ab7856b10ed68a2e90c7f488d20731b169
2014-08-22 11:17:31 +01:00
Maurice Lam
c1d149fd35
am 6d1a798c: am 103c3314: am 8be27595: Merge "[WifiSetup] Tablet portrait layout" into lmp-dev
...
* commit '6d1a798ce5e24fa1de63690f93c1d0fe35b2e852':
[WifiSetup] Tablet portrait layout
2014-08-22 03:14:02 +00:00
Jim Miller
9d25005e7a
Show trust agent entries as disabled rather than removing them.
...
Fixes bug 17108810
Change-Id: I646f5c299cd680d5c3a4978610f3852eba4b116b
2014-08-21 19:46:26 -07:00
Maurice Lam
103c33145c
am 8be27595: Merge "[WifiSetup] Tablet portrait layout" into lmp-dev
...
* commit '8be27595766a632da8ef78a0a8eaa8dc041232d8':
[WifiSetup] Tablet portrait layout
2014-08-22 01:34:31 +00:00
Maurice Lam
8be2759576
Merge "[WifiSetup] Tablet portrait layout" into lmp-dev
2014-08-22 01:22:25 +00:00
Amith Yamasani
93ed43524d
am 727b53ad: am 8cf1ec35: am 2534be37: Merge "Fix layout of Apn Settings screen" into lmp-dev
...
* commit '727b53adecc436a91cb7333a59152305b93f94cd':
Fix layout of Apn Settings screen
2014-08-21 21:23:52 +00:00
Amith Yamasani
8cf1ec351f
am 2534be37: Merge "Fix layout of Apn Settings screen" into lmp-dev
...
* commit '2534be37462f9ab5c98ca07758d71f98019eddf4':
Fix layout of Apn Settings screen
2014-08-21 21:03:27 +00:00
Amith Yamasani
2534be3746
Merge "Fix layout of Apn Settings screen" into lmp-dev
2014-08-21 20:51:44 +00:00
Amith Yamasani
ce3cd9df9b
Fix layout of Apn Settings screen
...
Bug: 14081992
Change-Id: I64c458e1585d469434efafd942876f64508723a1
2014-08-21 13:30:35 -07:00
PauloftheWest
2b41c90fed
Removed the Wi-Fi icon shown when Wi-Fi is off.
...
Bug: 16570104
Change-Id: Iacee07c225f6609b92f1df193b682fde0a720a92
2014-08-21 11:57:29 -07:00
Kenny Guy
2c7addd8ab
am 38afb092: am 100d45ec: am 66b0d9e8: Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev
...
* commit '38afb092aecc5585d75ef3d5e54129d3600d1ae6':
Disable non-permitted accessibility services and IMEs
2014-08-21 18:15:56 +00:00
Kenny Guy
100d45ec09
am 66b0d9e8: Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev
...
* commit '66b0d9e809a67689daf9b060e5464b4cc196169f':
Disable non-permitted accessibility services and IMEs
2014-08-21 17:57:32 +00:00
Kenny Guy
333f2bc71a
Disable non-permitted accessibility services and IMEs
...
Bug: 14469005
Change-Id: I4986f035318854c27ecb92bbe2f0c977d53b6361
2014-08-21 17:15:49 +01:00
Jessica Hummel
9dff428485
am 1cba7345: am a477e891: am ff2da2cd: Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev
...
* commit '1cba7345801050c90652beed852d7209b7a948b9':
Make string for work profile consistent with provisioning and framework strings.
2014-08-21 13:39:29 +00:00
Alexandra Gherghina
75783290b6
Modify Spinner so that the arrow is closer to the text
...
Bug: 17137945
Change-Id: I0769b030669a7a57e0be1c03f987bcd1e0f774ca
2014-08-21 12:44:55 +01:00
Jessica Hummel
a477e8910c
am ff2da2cd: Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev
...
* commit 'ff2da2cdb332be35bc94e3e66a10d55fe7bb0105':
Make string for work profile consistent with provisioning and framework strings.
2014-08-21 11:35:04 +00:00
Jessica Hummel
ff2da2cdb3
Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev
2014-08-21 11:28:24 +00:00
Tadashi G. Takaoka
d9035ef969
am 389bea96: am d925c995: am fe3794a9: Remove "Choose Keyboards" settings
...
* commit '389bea96d92ee162d5bb286884f9e536baca05c2':
Remove "Choose Keyboards" settings
2014-08-21 05:16:19 +00:00