Maurice Lam
aea9ae0004
Merge "[WifiSetup] Fix colors during setup" into lmp-dev
2014-08-12 20:02:46 +00:00
PauloftheWest
dab86ad25b
am c2321bfe: am 40e1d0db: am 0cfb3c07: Merge "Revised Bluetooth discoverability string." into lmp-dev
...
* commit 'c2321bfe294fe2794b4e8a2c194eaa61d1f516c8':
Revised Bluetooth discoverability string.
2014-08-12 18:42:45 +00:00
PauloftheWest
40e1d0db82
am 0cfb3c07: Merge "Revised Bluetooth discoverability string." into lmp-dev
...
* commit '0cfb3c079f2bcf3cdfb4d8b54ff856ff0228271e':
Revised Bluetooth discoverability string.
2014-08-12 18:33:29 +00:00
Baligh Uddin
b82066e238
Import translations. DO NOT MERGE
...
Change-Id: Ibd15fd67b24d78f6c4378008e24d7a50874b7491
Auto-generated-cl: translation import
2014-08-11 21:22:01 -07:00
Baligh Uddin
320bcf7b67
Import translations. DO NOT MERGE
...
Change-Id: I0470d9e27435942ef7b8712baadb1eb728641eec
Auto-generated-cl: translation import
2014-08-11 21:11:12 -07:00
Maurice Lam
7a77a8b2a4
[WifiSetup] Fix colors during setup
...
Fixed background color for dark theme, Wi-Fi icon color for light
and dark themes, "Add another network" button color for light and
dark themes. Created wifi_signal_colored which uses wifi_signal_color
to tint the Wi-Fi icon.
Also fixed theme extra propagation.
Bug: 16903606
Change-Id: Iab24828f888d7827184762d0d63d139d0a2c381e
2014-08-11 18:53:21 -07:00
Jim Miller
968c25bb4a
am 9df6f518: am 40698b76: am 898671f1: Merge "Update SecuritySettings to use SwitchPreference" into lmp-dev
...
* commit '9df6f5180bce0f2d33aec16b79b66536546716e9':
Update SecuritySettings to use SwitchPreference
2014-08-12 01:01:31 +00:00
Jim Miller
40698b76c4
am 898671f1: Merge "Update SecuritySettings to use SwitchPreference" into lmp-dev
...
* commit '898671f14123695d74bd308450a462d11a341d1a':
Update SecuritySettings to use SwitchPreference
2014-08-12 00:54:00 +00:00
Etan Cohen
d024f03bf7
am 1cff2416: am 047a6aa5: am 19465fa3: Revert "Radio Information UI for enabling/disabling debug settings of MO over VoLTE"
...
* commit '1cff2416a15de353597d81b458c236849df60b04':
Revert "Radio Information UI for enabling/disabling debug settings of MO over VoLTE"
2014-08-12 00:13:23 +00:00
Etan Cohen
047a6aa59a
am 19465fa3: Revert "Radio Information UI for enabling/disabling debug settings of MO over VoLTE"
...
* commit '19465fa3eb8f9a4047f83cf422a77c3b0c2e19f6':
Revert "Radio Information UI for enabling/disabling debug settings of MO over VoLTE"
2014-08-12 00:00:03 +00:00
Etan Cohen
19465fa3eb
Revert "Radio Information UI for enabling/disabling debug settings of MO over VoLTE"
...
Superseded by "Enhanced 4G LTE Mode" official setting.
This reverts commit 572d253982 .
2014-08-11 23:55:01 +00:00
Fabrice Di Meglio
bf33c50ddd
am afba43a1: am 10697f70: am 26d8c0e9: Merge "Fix bug #16951566 Switchbar color needs to change to ff37474f" into lmp-dev
...
* commit 'afba43a159d4549581dcc3f3c3b9e44ae0dcf0cb':
Fix bug #16951566 Switchbar color needs to change to ff37474f
2014-08-11 22:43:44 +00:00
Fabrice Di Meglio
10697f7098
am 26d8c0e9: Merge "Fix bug #16951566 Switchbar color needs to change to ff37474f" into lmp-dev
...
* commit '26d8c0e99e51025b4dd9b50820ed94033fac4d66':
Fix bug #16951566 Switchbar color needs to change to ff37474f
2014-08-11 22:35:08 +00:00
Paul Lawrence
3299c3e3de
am 596dd64f: am 9edd2e4a: am ccf49c02: Merge "Fix UI to mocks" into lmp-dev
...
* commit '596dd64f4298229cc081e9f360313394117518f4':
Fix UI to mocks
2014-08-11 22:21:55 +00:00
Paul Lawrence
9edd2e4a6b
am ccf49c02: Merge "Fix UI to mocks" into lmp-dev
...
* commit 'ccf49c0206d84f5b20a98a8a60278c3e357675eb':
Fix UI to mocks
2014-08-11 22:14:14 +00:00
Michael Wright
32f48265c2
am 8190ee16: am 7d558271: am bb76ee92: Merge "Remove non-functional hardware keyboard options." into lmp-dev
...
* commit '8190ee16c1c7d7150d3d6b29fe3974c73a62327d':
Remove non-functional hardware keyboard options.
2014-08-11 21:02:59 +00:00
Michael Wright
7d55827198
am bb76ee92: Merge "Remove non-functional hardware keyboard options." into lmp-dev
...
* commit 'bb76ee92bc69a6ccae7c9085e23a45504c2c1217':
Remove non-functional hardware keyboard options.
2014-08-11 20:53:16 +00:00
Michael Wright
bb76ee92bc
Merge "Remove non-functional hardware keyboard options." into lmp-dev
2014-08-11 18:20:32 +00:00
Michael Wright
572f90bdf8
Remove non-functional hardware keyboard options.
...
Bug: 16027438
Bug: 16486654
Change-Id: Ia53d5d98c05586bbbd232519d8094706877ecaaf
2014-08-11 13:02:09 -07:00
Fabrice Di Meglio
26d8c0e99e
Merge "Fix bug #16951566 Switchbar color needs to change to ff37474f" into lmp-dev
2014-08-11 18:20:32 +00:00
Fabrice Di Meglio
8da603f230
Fix bug #16951566 Switchbar color needs to change to ff37474f
...
- change the SwitchBar color as requested by UX
Change-Id: I3ca81e8ac0276fa9aab205f0045cd8b14855ddf7
2014-08-11 15:31:33 -07:00
Paul Lawrence
ccf49c0206
Merge "Fix UI to mocks" into lmp-dev
2014-08-11 18:20:32 +00:00
Paul Lawrence
4fd2e5f398
Fix UI to mocks
...
Bug: 16034329
Change-Id: I6746baeee3f49ad1df2524d690c870f49afedb48
2014-08-11 15:00:00 -07:00
Jim Miller
898671f141
Merge "Update SecuritySettings to use SwitchPreference" into lmp-dev
2014-08-11 18:14:57 +00:00
Jim Miller
4a9065e654
Update SecuritySettings to use SwitchPreference
...
Fixes bug 16900059
Change-Id: Ic3d498c3c4da32f1ba75559073957bb1087912f1
2014-08-11 16:35:41 -07:00
PauloftheWest
cccc5defd6
Merge "Added WiFi Assistant settings." into lmp-dev
2014-08-11 17:55:01 +00:00
PauloftheWest
d60f85daad
Added WiFi Assistant settings.
...
+ Added ability to setup Wifi Assistant.
- Removed 'Avoid poor connections' from WiFi Advance Settings.
- Removed 'Optimize Wi-Fi' from WiFi Advance Settings.
+ Replaced checkboxes with switches in WifFI Advance Settings.
+ Added horizontal rule to seperate MAC/IP address text.
Bug: 15698824
Change-Id: Ia319ff5fb2566854666a07d0e77c8816a49fd3d6
2014-08-12 11:27:38 -07:00
PauloftheWest
ad11a0f989
Revised Bluetooth discoverability string.
...
Bug: 16882911
Change-Id: I89ec10c42747079e9714ae618294d06997059159
2014-08-12 09:09:05 -07:00
Zoltan Szatmary-Ban
15c212b855
am 986df0c9: am 3acb8874: am d58f0bd6: Merge "Increase CHAR_LIMIT on Device Admins Settings message" into lmp-dev
...
* commit '986df0c92ae5900f196a114396802a7d1edaeed7':
Increase CHAR_LIMIT on Device Admins Settings message
2014-08-11 12:19:42 +00:00
Zoltan Szatmary-Ban
3acb88746a
am d58f0bd6: Merge "Increase CHAR_LIMIT on Device Admins Settings message" into lmp-dev
...
* commit 'd58f0bd64f1554a4c15b812bcd90fc52f00860b6':
Increase CHAR_LIMIT on Device Admins Settings message
2014-08-11 12:13:51 +00:00
Alexandra Gherghina
80f5a84bf0
am d857636e: am bad9e585: am ad54ba70: Merge "Show managed profile under accounts rather than users" into lmp-dev
...
* commit 'd857636eec3bbb862a9259130fca569c95de3b72':
Show managed profile under accounts rather than users
2014-08-11 09:35:53 +00:00
Alexandra Gherghina
bad9e585dd
am ad54ba70: Merge "Show managed profile under accounts rather than users" into lmp-dev
...
* commit 'ad54ba7030be6654bd76b3ee1a001d388130bcac':
Show managed profile under accounts rather than users
2014-08-11 09:29:20 +00:00
Paul Lawrence
9ab22ac93d
am b1f3a008: am c4427491: am f8811a59: Merge "Strings for next change" into lmp-dev
...
* commit 'b1f3a00884dd1e68e460313b1dbb33fbe3c56ba2':
Strings for next change
2014-08-08 23:11:24 +00:00
Paul Lawrence
c44274917f
am f8811a59: Merge "Strings for next change" into lmp-dev
...
* commit 'f8811a59ffd4fa39997154681d753d3370697b83':
Strings for next change
2014-08-08 22:59:36 +00:00
Zoltan Szatmary-Ban
d58f0bd64f
Merge "Increase CHAR_LIMIT on Device Admins Settings message" into lmp-dev
2014-08-08 20:34:05 +00:00
Zoltan Szatmary-Ban
a1373770c1
Increase CHAR_LIMIT on Device Admins Settings message
...
Increased CHAR_LIMIT to 120 on @string/managed_profile_device_admin_info to
accomodate translation.
Bug:16838113
Change-Id: I111ed73d6ff546387c4a2b5df5f4edf8a3932be7
2014-08-11 11:50:39 +01:00
Alexandra Gherghina
ad54ba7030
Merge "Show managed profile under accounts rather than users" into lmp-dev
2014-08-08 20:34:05 +00:00
Alexandra Gherghina
83adb564de
Show managed profile under accounts rather than users
...
Also fixes overflow menu to update on remove/add managed profile.
Bug: 16234745
Bug: 16727076
Change-Id: I3283a8fa0096edfce5aad633e09ba3eed6d2174c
2014-08-11 10:02:13 +01:00
Fabrice Di Meglio
1e283ab2ec
am 60b77e55: am 7aa645e4: am 07fd3469: Merge "Fix Wi-Fi Assistant padding" into lmp-dev
...
* commit '60b77e55dc3595dffec93954c1833d82af1c9a08':
Fix Wi-Fi Assistant padding
2014-08-08 20:08:45 +00:00
Fabrice Di Meglio
7aa645e498
am 07fd3469: Merge "Fix Wi-Fi Assistant padding" into lmp-dev
...
* commit '07fd346996c61c47e1dc13648cbbde3090a4b248':
Fix Wi-Fi Assistant padding
2014-08-08 20:02:19 +00:00
PauloftheWest
f87e196918
am f1103f73: am fc5a4085: am 14f60296: Merge "Fixed Bluetooth renaming bug." into lmp-dev
...
* commit 'f1103f73f47be9228b8b61806f945a4d2b953503':
Fixed Bluetooth renaming bug.
2014-08-08 17:39:18 +00:00
PauloftheWest
fc5a4085e1
am 14f60296: Merge "Fixed Bluetooth renaming bug." into lmp-dev
...
* commit '14f60296574316f94ca03fb82fc3675db373734e':
Fixed Bluetooth renaming bug.
2014-08-08 17:24:12 +00:00
Dan Sandler
e7292d07b1
am c6b71394: am f27ee3c6: am b5fca457: Merge "Fully deprecate Power Control widget." into lmp-dev
...
* commit 'c6b71394ae0380d97e1b312f34f4214e32a5a750':
Fully deprecate Power Control widget.
2014-08-08 13:07:09 +00:00
Dan Sandler
f27ee3c6e2
am b5fca457: Merge "Fully deprecate Power Control widget." into lmp-dev
...
* commit 'b5fca45768d36552ce74785dfbc9d7da7ce67bea':
Fully deprecate Power Control widget.
2014-08-08 12:59:34 +00:00
PauloftheWest
0fa724c0a1
am 327b6661: am 5380f196: am 689d2ce2: Changed a Bluetooth device\'s settings from an activity to a dialog.
...
* commit '327b66619a1be472b4051ad8e5101a1551fa718e':
Changed a Bluetooth device's settings from an activity to a dialog.
2014-08-08 02:27:08 +00:00
Paul Lawrence
f8811a59ff
Merge "Strings for next change" into lmp-dev
2014-08-07 18:49:59 +00:00
Paul Lawrence
1d14e386af
Strings for next change
...
Next change is titled
Bring up factory reset UI when decryption fails but password is correct
Strings need to go in today to catch translation for L
Bug: 11477689
Change-Id: I84ddc2f88917ba9749fe4dc58fb00d4020cfe685
2014-08-08 15:10:18 -07:00
Fabrice Di Meglio
07fd346996
Merge "Fix Wi-Fi Assistant padding" into lmp-dev
2014-08-07 18:49:59 +00:00
Fabrice Di Meglio
bbed3dfdfd
Fix Wi-Fi Assistant padding
...
- use the standard list padding instead of a custom one
See bug: #15703202 Wi-Fi Assistant card needs to appear in Wi-Fi network list
Change-Id: I5816751bf7937807093e5b74b25b84151431fa7b
2014-08-08 12:56:51 -07:00
PauloftheWest
5380f196a2
am 689d2ce2: Changed a Bluetooth device\'s settings from an activity to a dialog.
...
* commit '689d2ce29b3093c32d1d2b70caa6fb36a4ecefcb':
Changed a Bluetooth device's settings from an activity to a dialog.
2014-08-07 18:40:34 +00:00