Commit Graph

916 Commits

Author SHA1 Message Date
Sanket Padawe
d85aa17894 Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev 2014-11-17 23:53:13 +00:00
Sanket Padawe
a8bd025d35 Adding icons to sim color selection in settings UI.
Adding icons to sim color selection of sim settings UI.

Bug: 18380838
Change-Id: I98f07721aa234ff58a64a0c694206b085385bdec
2014-11-17 10:43:37 -08:00
PauloftheWest
acb160baa3 Merge "Added tabs for Multi-SIM SIM Lock." into lmp-mr1-dev 2014-11-17 16:12:44 +00:00
John Spurlock
fdebfc35c4 Settings: Add effects suppression text to Ring volume.
If the effects are being muted by a notification listener, display
a "Muted by <x>" msg instead of an active slider inside the
Ring/Notification volume setting pref.

Update volume pref design to optimize for this new custom appearance.

Depends on frameworks/base:
  Icdb5f85eb4bcaa1ead7d77c1460e06ad3f0604d5

Bug: 17461563
Change-Id: I6da871e16009370402451a2ff507de4762644a80
2014-11-14 14:38:03 -05:00
PauloftheWest
1d891b4caa Added tabs for Multi-SIM SIM Lock.
Bug: 18147652
Change-Id: I89d3ffb0b1451d263d7c913ac210d52d5308f3c0
2014-11-14 10:38:43 -08:00
PauloftheWest
26104298eb Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev 2014-11-13 13:57:09 +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
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
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
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
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
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
2625d8ed89 Merge "Adjust caption preset picker items dimens for Material" into lmp-mr1-dev 2014-10-22 01:25:24 +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
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
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
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
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
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
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