Sander Alewijnse
fbda0b3a81
am 320dc051
: Merge "Add extra to home settings starting intent." into lmp-dev
...
* commit '320dc05125c0db44c1182c4f5568bef440f643c8':
Add extra to home settings starting intent.
2014-08-26 17:07:18 +00:00
Sander Alewijnse
320dc05125
Merge "Add extra to home settings starting intent." into lmp-dev
2014-08-26 16:59:24 +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
Amith Yamasani
e352845eca
Merge "Fix toggle button clickability in app restrictions" into lmp-dev
2014-08-25 23:18:33 +00:00
Alan Viverette
4895df355a
Update material colors
...
BUG: 17212898
Change-Id: Idb1c391de3c1fb150f06c3cf744780be1404d2e5
2014-08-25 16:05:50 -07:00
Nancy Chen
64e686570c
am a1ca4ed1
: Merge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev
...
* commit 'a1ca4ed14d12cd3daa8bb5db5527676ca78c1850':
API Review PhoneManager -> TelecommManager. Rename methods (3/6)
2014-08-25 22:47:23 +00:00
Nancy Chen
a1ca4ed14d
Merge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev
2014-08-25 22:24:15 +00: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
Paul Lawrence
ef0a4938a0
am ee2a85c7
: Merge "Honor hide pattern on crypto screen" into lmp-dev
...
* commit 'ee2a85c7c8a91db3067d9908b4b04d329a40ba71':
Honor hide pattern on crypto screen
2014-08-25 22:09:41 +00:00
Paul Lawrence
ee2a85c7c8
Merge "Honor hide pattern on crypto screen" into lmp-dev
2014-08-25 21:59:27 +00:00
Maurice Lam
b6c414a6d2
[WifiSetup] Progress when wifi scanning
...
Use a custom empty view to show the status while wifi is scanning
or off. Cannot use android.R.id.empty because in phone portrait
layout the illustration is the listview header, which will be hidden
if the list is empty and we use ListView.setEmptyView.
Bug: 17183006
Change-Id: Ie8598303f4e61f87e078008fb7a03918ba92c9ef
2014-08-25 13:19:49 -07: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
d9960178fd
am cef6b220
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'cef6b220d6bf5c6ad003d2d528ad4dea305adf60':
Import translations. DO NOT MERGE
2014-08-25 16:32:55 +00:00
Baligh Uddin
cef6b220d6
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-08-25 16:21:03 +00:00
PauloftheWest
1c649f7f9b
am 7560e22d
: Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev
...
* commit '7560e22d7602250172f6e6ca16fdea0063348d15':
Tapping a connected Bluetooth device now presents its settings dialog.
2014-08-25 15:58:29 +00:00
PauloftheWest
7560e22d76
Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev
2014-08-25 15:48:16 +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
PauloftheWest
893be9cc34
Tapping a connected Bluetooth device now presents its settings dialog.
...
Bug: 14184769
Change-Id: I1de3110dd7460e0329dbe6df99abf3451d3041cc
2014-08-25 15:40:56 +00:00
PauloftheWest
7f74c6e815
Greyed out SIM activities if only one SIM is present.
...
Bug: 17011861
Change-Id: I335e127e462719d6cd14a5a9d383b378dbf90490
2014-08-24 13:33:25 -07: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
Jeff Davidson
fc24d0a780
am 8e6edba5
: Merge "Restore legacy VPN stats dialog." into lmp-dev
...
* commit '8e6edba5606fd717a631aabcc4c5702bdd509033':
Restore legacy VPN stats dialog.
2014-08-23 01:12:46 +00:00
Amith Yamasani
8fe710682a
Merge "Don't index the ChooseLockGeneric screen" into lmp-dev
2014-08-23 01:07:03 +00:00
Jeff Davidson
8e6edba560
Merge "Restore legacy VPN stats dialog." into lmp-dev
2014-08-23 00:55: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
Nancy Chen
db848a5de6
API Review PhoneManager -> TelecommManager. Rename methods (3/6)
...
PhoneManager
- handlePinMMI docs should explain what a Pin is and what MMI is
- rename isInAPhoneCall to isInCall
- rename showCallScreen to showInCallScreen
- merge this class into TelecommManager, we don't need both
Bug: 16960458
Change-Id: I8285f15747b66fdfad93d203d848d4a62c0f9b2a
2014-08-22 15:12:01 -07:00
Elliott Hughes
21fc35c128
am d5ee3bc8
: Merge "Settings psuedolocalization fixes." into lmp-dev
...
* commit 'd5ee3bc858f2e3c7e4dee6887c982c768c355c7a':
Settings psuedolocalization fixes.
2014-08-22 20:51:00 +00:00
Elliott Hughes
d5ee3bc858
Merge "Settings psuedolocalization fixes." into lmp-dev
2014-08-22 20:42:38 +00:00
Jeff Davidson
b2bb1973fe
Restore legacy VPN stats dialog.
...
Was originally removed in ag/522961, but restoring to keep legacy VPN
behavior the same from within VpnSettings. This dialog is only
accesible from VpnSettings and so should only ever be shown for legacy
VPNs.
Bug: 17164793
Change-Id: I06c4e136e1023b8f84edfd15a15264d2e41d325b
2014-08-22 13:12:01 -07:00
Amith Yamasani
cf4e004e7d
am 8802ccf8
: Merge "Switch user on clicking on a user in User Settings" into lmp-dev
...
* commit '8802ccf853b86ba56816ddd06346812b61e58220':
Switch user on clicking on a user in User Settings
2014-08-22 19:41:59 +00:00
Amith Yamasani
8802ccf853
Merge "Switch user on clicking on a user in User Settings" into lmp-dev
2014-08-22 19:37:09 +00:00
Amith Yamasani
f7ba74df59
Switch user on clicking on a user in User Settings
...
This slipped out of the code somehow.
Bug: 15761405
Change-Id: I89c47221f999d5ef23aa7910d31a95bfa730353c
2014-08-22 12:33:23 -07:00
Elliott Hughes
c550f0bff4
Settings psuedolocalization fixes.
...
We don't need -c zz_ZZ any more, and LocalePicker now checks
the global developer options settings itself.
Also remove some dead code now zz_ZY and zz_ZZ are gone.
Bug: 17190407
Change-Id: I27f9f5bc8b27457004e7e4996ec76b76a17523eb
2014-08-22 12:24:00 -07:00
Baligh Uddin
79ace56565
am 3723625f
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '3723625fecf9d1402e4d1747d9342ed12235184e':
Import translations. DO NOT MERGE
2014-08-22 17:32:04 +00:00
Baligh Uddin
3723625fec
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-08-22 17:24:31 +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
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