PauloftheWest
26104298eb
Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev
2014-11-13 13:57:09 +00:00
Sanket Padawe
6d795b9161
am 2856fb31: am f722ff93: am 6416bec0: Merge "UI changes for icons in sim settings" into lmp-mr1-dev
...
* commit '2856fb31e8b573b54f8064941795efcd8a9324bd':
UI changes for icons in sim settings
2014-11-13 02:13:26 +00:00
PauloftheWest
76b0801173
Adding Sim Status menu to Settings.
...
+ Added tabs for Multi-SIM devices.
+ Most of the code was taken from MediaTek
(https://partner-android-review.googlesource.com/#/c/181417 )
Bug: 18195254
Change-Id: If6f7d5cfa4d41adb52dfc1bd035b4ff79d926bd8
2014-11-12 14:52:18 -08:00
Sanket Padawe
0381f6c675
UI changes for icons in sim settings
...
+ UI changes relate to displaying sim icons in sim settings
+ Correcting way to display phone number inside sim settings dialog
Bug: 18356419
Change-Id: I1fe025fac52f20b607d4492b99cfef9588ec9416
2014-11-12 12:41:35 -08:00
Zoltan Szatmary-Ban
7cc1b9e63e
Show managed profile accounts on Settings > Factory Reset
...
List both primary profile's and managed profile's accounts. Also notify the user
if there are other users present on the device.
Bug: 17899181
Change-Id: I5401722e65305861edeed60cfe926fca5c81a418
2014-11-12 01:18:29 +00:00
Jason Monk
cbf1d5d0dc
am dac36faf: am cc0a2c55: Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev
...
automerge: 0ae5f60
2014-11-07 17:18:40 +00:00
Jason Monk
cc0a2c554a
Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev
2014-11-07 16:58:37 +00:00
Jason Monk
d570e9839e
Screen pinning: fix strings and add scrollview
...
Update strings as requested from ewong, and add scrollview around
description for large-text/small-device case.
Bug: 18287056
Bug: 17177672
Change-Id: Ie34007d263a1fbc77fc8f435dbcd23a36f1766c3
2014-11-07 11:46:33 -05:00
Alexandra Gherghina
eb320d2bad
am 6f8019d8: am fcb880c6: am ee70c699: Merge "Update text for apps installed for other users" into lmp-mr1-dev
...
* commit '6f8019d8891095cce375ce7f7ebbf3ad8ba6d57c':
Update text for apps installed for other users
2014-11-07 10:48:43 +00:00
Alexandra Gherghina
ee70c69919
Merge "Update text for apps installed for other users" into lmp-mr1-dev
2014-11-07 10:35:38 +00:00
Alexandra Gherghina
d9ed84375d
Update text for apps installed for other users
...
This also refactors the layout to accommodate longer text
Bug: 16364316
Change-Id: I41eacba5b09a4f13af9695594c1a53eae075554f
2014-11-07 10:05:49 +00:00
Jeff Davidson
568d156089
am 0fc9271b: am c4a68608: am 99f191f5: Remove the Wi-Fi Assistant card.
...
* commit '0fc9271b21b46b6972dcf0e976d20605042b0b38':
Remove the Wi-Fi Assistant card.
2014-11-07 04:12:59 +00:00
Jeff Davidson
99f191f585
Remove the Wi-Fi Assistant card.
...
Per the latest mocks, advanced wireless settings will be the only
location in platform settings where Wi-Fi Assistants are configured.
The card is no longer being used.
Bug: 13780935
Change-Id: Idddf971404532256165045665bd0a6b19966d2bd
2014-11-06 13:30:34 -08:00
Sanket Padawe
197976e6d1
resolve merge conflicts of 4e4a3f8 to master.
...
Change-Id: Idab7b34c8c3f4a833686fb104e1869438b2df51d
2014-10-30 11:05:55 -07:00
Paul Lawrence
7d0b95f4c9
am 870de3ee: am be492644: am 00abeba2: Merge "Make emergency button right size" into lmp-mr1-dev
...
* commit '870de3eeb9ebcf097ca48c63fd67a864829b6acf':
Make emergency button right size
2014-10-30 10:26:05 +00:00
Sanket Padawe
917aaf9ebd
Merge "Add sim color selection in settings" into lmp-mr1-dev
2014-10-28 22:48:33 +00:00
Sanket Padawe
abc505aac3
Add sim color selection in settings
...
Adding a dropdown list to select sim color from sim settings UI.
Change-Id: I26da0a79f5b1edf829fc5d46af2c0c23962226b8
2014-10-28 14:01:50 -07:00
Paul Lawrence
59717ad3a7
Make emergency button right size
...
Bug: 18123894
Bug: 17394128
Change-Id: I248890b82f62146e1814172fd8b67e9a39661997
2014-10-28 19:01:18 +00:00
Sanket Padawe
61990241c1
am 35f83ca9: am 844c2a77: am 7ff1718e: am 5fd97c55: Merge "WIP support icon" into lmp-sprout-dev
...
* commit '35f83ca9966e22b5fe4a115114bd37ea1cb07847':
WIP support icon
2014-10-24 17:52:53 +00:00
Sanket Padawe
7ff1718e1f
am 5fd97c55: Merge "WIP support icon" into lmp-sprout-dev
...
* commit '5fd97c551fb8cbcc43d762d9c609be1061cc5170':
WIP support icon
2014-10-24 17:39:21 +00:00
Sanket Padawe
0f596b90fe
WIP support icon
...
Added static sim icon to alert box for selecting different sim accounts.
Change-Id: Ib22ceba4b96d636754d7946859f194488517ff9d
2014-10-24 10:17:08 -07:00
Alan Viverette
bfa1932e89
am 2625d8ed: Merge "Adjust caption preset picker items dimens for Material" into lmp-mr1-dev automerge: 6a4d223
...
automerge: c734de2
2014-10-22 05:52:36 +00:00
Alan Viverette
2625d8ed89
Merge "Adjust caption preset picker items dimens for Material" into lmp-mr1-dev
2014-10-22 01:25:24 +00:00
Alexandra Gherghina
a160b96005
am b9d05d6c: Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev automerge: 3748b94
...
automerge: 3ac497d
2014-10-22 00:59:20 +00:00
Alan Viverette
285fb04711
Adjust caption preset picker items dimens for Material
...
BUG: 18027521
Change-Id: Icce397410af495639df0b6852b21c159ec103ed8
2014-10-21 16:51:54 -07:00
Alexandra Gherghina
2999ce46c3
am 7574ee6a: am aadc070a: Move up spinner in apps screen
...
automerge: 9dbaf77
2014-10-21 22:57:20 +00:00
Alexandra Gherghina
b9d05d6c63
Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev
2014-10-21 22:20:07 +00:00
Alexandra Gherghina
aadc070a35
Move up spinner in apps screen
...
Bug: 18006320
Change-Id: Ic23c2c3e02a6c6a20b180065975228d42fd91899
2014-10-21 18:39:07 +01:00
Fabrice Di Meglio
01f144f70a
am 065c5906: am 6e7216ab: am 140b46e4: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
...
* commit '065c5906bdbe19e775d2aca1df8dc82567390db3':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
2014-10-17 21:46:49 +00:00
Fabrice Di Meglio
140b46e43c
Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
2014-10-17 21:32:34 +00:00
Fabrice Di Meglio
71b2c07877
am dd6c3cc2: am dd89d6d5: am 27c0b548: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
...
* commit 'dd6c3cc2b453ae6b642d08340daf68a02c55ee87':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
2014-10-17 21:28:50 +00:00
Svetoslav
e90cde72ca
am 8cfd94de: am dfa12ed4: am b363c26e: am 431e2460: am 3ea423ae: User to confirm credentials if an accessibility service changes encryption.
...
* commit '8cfd94de1dcbe707f3747cc9515e4c3562f6b092':
User to confirm credentials if an accessibility service changes encryption.
2014-10-17 21:28:41 +00:00
Fabrice Di Meglio
44db45ac11
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
...
Per UX request, convert Trusted Credentials CheckBoxes to Switches
Change-Id: If878e8c10454a212ba9052280e3cbb17c0fdeeca
2014-10-17 14:06:22 -07:00
Fabrice Di Meglio
27c0b548ab
Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
2014-10-17 20:46:32 +00:00
Svetoslav
b363c26e2f
am 431e2460: am 3ea423ae: User to confirm credentials if an accessibility service changes encryption.
...
* commit '431e246032d58b8aae72d348107f0d2aaa9efbac':
User to confirm credentials if an accessibility service changes encryption.
2014-10-17 18:53:32 +00:00
Svetoslav
431e246032
am 3ea423ae: User to confirm credentials if an accessibility service changes encryption.
...
* commit '3ea423ae0ff56d249b6844b3a68c67ee5eba243d':
User to confirm credentials if an accessibility service changes encryption.
2014-10-17 16:56:40 +00:00
Sami Tolvanen
b80fcc8289
am 63af7fc7: Remove excess whitespace from the factory reset screen automerge: c145d17
...
automerge: 0be4088
2014-10-17 01:38:05 +00:00
Svetoslav
3ea423ae0f
User to confirm credentials if an accessibility service changes encryption.
...
When an accessibility service is enabled we are not using the user secure
lock when encrypting the data. If the latter is already used for encryption
we are decreasing the encryption level and therefore shall challenge the
user with their secure lock.
bug:17881324
Change-Id: If8905c05e20bc6bb6a6415e501871e5ad83f3d86
2014-10-16 17:35:07 -07:00
Fabrice Di Meglio
1bc996532c
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
...
Per UX request, convert Account Sync feeds CheckBoxes to Switches
Change-Id: I7017020700b4214a16ca119a6992e6c7a484db0b
2014-10-16 17:16:26 -07:00
Sami Tolvanen
81df517bb8
Merge "Refactor the duplicate Switch IME button to an include"
2014-10-16 22:24:25 +00:00
Sami Tolvanen
63af7fc70e
Remove excess whitespace from the factory reset screen
...
The bullet pointed list in the factory reset screen consists
of two separate strings, which lead to excess whitespace
between the two segments of the list. Remove padding from the
text views to remove the whitespace.
Bug: 17997459
Change-Id: I60eb6f0f2924323d7eb806ff2b1180ebc7189adb
2014-10-16 15:19:17 -07:00
Jim Miller
3ef52587da
resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev
...
Change-Id: Ic07a97df04c274bbfa980134c9f4589c65a7ef62
2014-10-15 13:54:37 -07:00
Sami Tolvanen
d64d05a540
Refactor the duplicate Switch IME button to an include
...
Move duplicate code for switching input method from crypt_keeper_*_field.xml to an include.
Bug: 16375532
Change-Id: I0f9000d4a8c4bc8751b8cefd98fe429cbb02c37a
2014-10-15 16:53:14 +01:00
Jim Miller
46c7f6d6f3
Add a checkbox option to 'require password to decrypt'
...
Fixes bug 17881324
Change-Id: I3f256f448a35cf8104ee6acb4de253874101f7c0
2014-10-14 18:40:30 -07:00
Andres Morales
1686335a77
am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev
...
* commit '26bc6907b93a21adcdf8ffdc24d7d96482be8165':
Set layout_width in WiFi+NFC resource
2014-10-14 22:20:34 +00:00
Andres Morales
c5fdea08d2
Set layout_width in WiFi+NFC resource
...
Bug:17930750
Change-Id: Ida2fd6040a52cc5d7fa6fe6c4a8c86a1a2dc4208
2014-10-14 13:49:31 -07:00
Alexandra Gherghina
acd21060f3
Fix user spinner anchor following system ui changes
...
Bug: 17637769
Change-Id: I31d7f2358803ee5a769e48d5c069969ce81a253c
2014-10-14 18:04:24 +00:00
Sanket Padawe
770bdd771e
Removing display number format from SIM UI
...
Removed "Display Number" from the SIM settings UI.
Change-Id: Ib2b228931dfac56503ac56ffdf2238e6f416a469
2014-10-08 16:05:36 -07:00
PauloftheWest
4046cf9cb4
Merge "[DS] DSDS support for Settings" into lmp-sprout-dev
2014-10-03 22:45:26 +00:00
PauloftheWest
50e6ecacf9
[DS] DSDS support for Settings
...
+ Rebase and modify as APIs rename.
+ Fix bugs on set sub's name as title.
+ Enabled Sim Settings.
Change-Id: Ic731c7882be95b86b6b8dcdd3f208a6125681f3e
2014-10-03 15:22:59 -07:00
