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
* commit 'c734de2aadc7cad71945b9037978f8871eb3f8f6':
Adjust caption preset picker items dimens for Material
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
* commit '3ac497d8d5ba1f1b9f3e5e4d2b8af8ddc7539025':
Fix user spinner anchor following system ui changes
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
* commit '9dbaf77696c21b7ab857d7048fbbf442a3d23308':
Move up spinner in apps screen
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
* commit '0be4088ed9253da04f56999e1560ab522d5d9400':
Remove excess whitespace from the factory reset screen
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
PauloftheWest
6e26427e52
Updated Wi-Fi hotspot dialog to the Material Spec.
...
+ If there is scrolling then force the scrollbars to always appear.
+ Align contents of the dialog with the title.
+ Change "Network SSID" to "Network name".
+ Added wifi_* styles to other style xml files so that Wi-Fi hotspot dialogs are visible on tablets.
+ Move layout_width/height from res/layout/{wifi_dialog.xml, wifi_dialog_row.xml} from style into the xml file.
Bug: 17684359
Change-Id: I42fb69132d6ba0fb8d9853de6f5524f29e6b70b6
2014-10-02 14:25:03 -07:00
Svetoslav
5244844268
Use default encryption password if an accessibility service is enabled.
...
If accessibility is on and the user selectes a secure lock we use weaker
encryption to enable running accessibility layer at the time the user
authenticates. This change adds a warning message to the enable accessibility
service dialog if there is a secure lock and also adds a warning as a
summary for the secure lock in the lock chooser activity. Both warning
mention the weaker encryption to be used.
bug:17671790
Change-Id: Ib5cc9d3a78f751e18362bb9238fd2804c3b600f8
2014-09-30 23:03:37 +00:00
Alexandra Gherghina
e4124f4743
Match parent width for user spinner to fix tint
...
Bug: 17640172
Change-Id: I4cbea855cac9180d193f9ba936ec1bab81df537d
2014-09-25 11:29:17 +01:00
PauloftheWest
10773b4d4d
Removed an extraneous messge when pairing.
...
+ When two devices are executing Bluetooth simply pairing, which does
not need keyboard input, the message "Type the pairing code then press
Return or Enter." has been removed.
+ Note that in legacy pairing the message to type in the pairing key
should remain even if the user is only verifying the key. The reason is
that we are not able to guarantee the other device does not have to input
the key.
+ Also updated pin entry to Material/Quantum specification.
Bug: 17400402
Change-Id: I7853fa13835f7f60d0e71102de9a079708f3544e
2014-09-17 14:46:14 -07:00
Edward Jee
b0954c1d1e
Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
2014-09-16 01:19:07 +00:00
Edward Jee
a539716a94
Do not show phonebook access permission dialog if pairing dialog has already been shown.
...
Bug: 16964116, 13886947, 16345619
Change-Id: I9cf2622b49c3812771d57432fed030affaa5ba48
2014-09-15 14:33:13 -07:00
PauloftheWest
f4b548c0f5
Removed all references to "Google Wi-Fi Assistant" from Settings.
...
+ Removed Wi-Fi Assistant message in Wi-Fi Advanced since it was
overridden by the Wi-Fi Assistant.
+ Removed Wi-Fi Assistant message in Wi-Fi Assistant Card. Instead,
it is programatically created when the scorer is known.
+ "Google" was replaced with a placeholder.
Bug: 17457236
Change-Id: If3aab06c911ecf6ec13cbf00dea2fe9333abc1fc
2014-09-15 09:31:56 -07:00
PauloftheWest
b2197d90a8
Added bluetooth_device_settings_header to fix build breakage.
...
Change-Id: Ieca78c6bc34119e0cccc51a27cbcbf966b913bb1
2014-09-10 16:22:15 -07:00
PauloftheWest
1675c786bf
Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev
2014-09-10 22:11:56 +00:00
PauloftheWest
26747b9da0
Made Bluetooth device dialog fully scrollable.
...
+ Also updated padding around Available Devices.
+ Also updated opacity on Bluetooth's "your device is visible" message.
Bug: 17398966
Change-Id: Id9631334ee0f3a01e40b00470d6debf6a31abe47
2014-09-10 14:33:52 -07:00
Fabrice Di Meglio
877fb7fb42
Merge "Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev
2014-09-10 20:14:15 +00:00
Fabrice Di Meglio
ade5761557
Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility
...
- add missing string
Change-Id: I9c6a50353075b05d0f80d112c999b2579cdb6676
2014-09-10 13:12:25 -07:00
John Spurlock
cddb29544a
Settings: Make downtime days scrollable.
...
Bug:17428288
Change-Id: I389aece9d79d002426a0bcb03d4a523293012892
2014-09-10 10:04:44 -04:00
Zoltan Szatmary-Ban
574db42695
Merge "Update Trusted Credentials screen in settings" into lmp-dev
2014-09-09 11:05:54 +00:00
PauloftheWest
bec89d797b
Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev
2014-09-08 22:34:51 +00:00