Commit Graph

5695 Commits

Author SHA1 Message Date
PauloftheWest
7670de127c am 7c99c227: am 75235a29: am a14e3f33: Merge "Removed the Wi-Fi icon shown when Wi-Fi is off." into lmp-dev
* commit '7c99c2278e9415e70a258ced14f8f8170827cec6':
  Removed the Wi-Fi icon shown when Wi-Fi is off.
2014-08-27 22:06:15 +00:00
PauloftheWest
e4d0662ec5 am 55d10678: am 81fafc51: am db99ad93: Merge "Bluetooth Device picker will now scan for devices." into lmp-dev
* commit '55d106786a4e6a923dcbb3aa2926659abbd00e51':
  Bluetooth Device picker will now scan for devices.
2014-08-27 21:50:09 +00:00
PauloftheWest
da75eae851 am 7926eb04: am caccf27e: am d0ec53e3: Merge "Applied Material Spec to Bluetooth pairing dialog." into lmp-dev
* commit '7926eb04d94077d25d08697ea0c60e72eee506ac':
  Applied Material Spec to Bluetooth pairing dialog.
2014-08-27 21:50:03 +00:00
PauloftheWest
680f2fa97f am 0b618179: am fc4f23f0: am 6213ba0e: Merge "Changed VPN add icon to white." into lmp-dev
* commit '0b618179acb56e64d205d0aada50dda31889657a':
  Changed VPN add icon to white.
2014-08-27 21:50:02 +00:00
PauloftheWest
75235a2974 am a14e3f33: Merge "Removed the Wi-Fi icon shown when Wi-Fi is off." into lmp-dev
* commit 'a14e3f3373170ae126531a21bd9a121e0d886e53':
  Removed the Wi-Fi icon shown when Wi-Fi is off.
2014-08-27 21:48:47 +00:00
PauloftheWest
a14e3f3373 Merge "Removed the Wi-Fi icon shown when Wi-Fi is off." into lmp-dev 2014-08-27 21:40:09 +00:00
PauloftheWest
81fafc5143 am db99ad93: Merge "Bluetooth Device picker will now scan for devices." into lmp-dev
* commit 'db99ad9349c16665e3ca6c62192fe560d35d4a68':
  Bluetooth Device picker will now scan for devices.
2014-08-27 21:11:43 +00:00
PauloftheWest
db99ad9349 Merge "Bluetooth Device picker will now scan for devices." into lmp-dev 2014-08-27 21:01:47 +00:00
PauloftheWest
9432b926fe Bluetooth Device picker will now scan for devices.
Bug: 17157824
Change-Id: Ifcf17f55e942dbf6cdbe2a2ee30c90ddbd9c4bd8
2014-08-27 13:56:04 -07:00
PauloftheWest
caccf27e34 am d0ec53e3: Merge "Applied Material Spec to Bluetooth pairing dialog." into lmp-dev
* commit 'd0ec53e33360cfb5cf4c176920917ef109754f22':
  Applied Material Spec to Bluetooth pairing dialog.
2014-08-27 20:42:57 +00:00
PauloftheWest
fc4f23f0e7 am 6213ba0e: Merge "Changed VPN add icon to white." into lmp-dev
* commit '6213ba0ea107eabb6c9053c843c2c675ac03cfa4':
  Changed VPN add icon to white.
2014-08-27 20:42:56 +00:00
PauloftheWest
d0ec53e333 Merge "Applied Material Spec to Bluetooth pairing dialog." into lmp-dev 2014-08-27 20:40:38 +00:00
PauloftheWest
e49c30e533 Applied Material Spec to Bluetooth pairing dialog.
Bug: 17018290
Change-Id: I621164245e6ad8213a689ea4919c619a9ee4f189
2014-08-27 13:17:51 -07:00
PauloftheWest
5c6222e971 Changed VPN add icon to white.
Bug: 17288198
Change-Id: I5d66f269583d1d4bdb3e68fe011721ae805317e1
2014-08-27 12:54:50 -07:00
Baligh Uddin
5b025e75fb Import translations. DO NOT MERGE
Change-Id: I390fa4d46d53d077b371b1f0cc2d880208aedb7f
Auto-generated-cl: translation import
2014-08-26 21:00:49 -07:00
Baligh Uddin
a34ecf41b8 Import translations. DO NOT MERGE
Change-Id: I8ac9cf419f62a3420117bcaaffe4dca023ee1c9d
Auto-generated-cl: translation import
2014-08-26 20:49:33 -07:00
Alan Viverette
1d439572ec am f6faa4d2: am ea7c8dcb: am c61aabfa: Merge "Update material colors" into lmp-dev
* commit 'f6faa4d292186bd5927de59f96cfe7a2cb04156c':
  Update material colors
2014-08-26 10:17:17 +00:00
Amith Yamasani
6ef47af07d am 0f30cbed: am 19bcfd6e: am e352845e: Merge "Fix toggle button clickability in app restrictions" into lmp-dev
* commit '0f30cbed1a36c69b368869ec8178e6645973c9b3':
  Fix toggle button clickability in app restrictions
2014-08-26 10:17:16 +00:00
Alan Viverette
ea7c8dcbda am c61aabfa: Merge "Update material colors" into lmp-dev
* commit 'c61aabfa22e972a5173d2edc2aa5fd77fb37bdf9':
  Update material colors
2014-08-25 23:29:01 +00:00
Amith Yamasani
19bcfd6e43 am e352845e: Merge "Fix toggle button clickability in app restrictions" into lmp-dev
* commit 'e352845ecad452823bb2c3ba1b0eb1abf2e9a442':
  Fix toggle button clickability in app restrictions
2014-08-25 23:29:00 +00:00
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