Commit Graph

15333 Commits

Author SHA1 Message Date
Geoff Mendal
2f1272a9f3 Import translations. DO NOT MERGE
Change-Id: I8d9e5a58b77ec02b4311629c6520a86e9767a788
Auto-generated-cl: translation import
2014-10-13 12:44:59 -07:00
Alan Viverette
87b151c650 am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev
* commit '178db4d5f7522a81ee5cce02ccbb080c2e555697':
  Add option for serif monospace captioning font
2014-10-11 00:23:54 +00:00
Amit Mahajan
8151ef29aa resolved conflicts for merge of 88b2790d to lmp-sprout-dev
Change-Id: I4f43133131aa7ef8eeec97edc993da06c1883903
2014-10-10 17:17:53 -07:00
Alan Viverette
178db4d5f7 Merge "Add option for serif monospace captioning font" into lmp-dev 2014-10-10 23:40:58 +00:00
Amit Mahajan
88b2790d73 Merge "Fix to show signal strength as 0 if out of service." into lmp-dev 2014-10-10 22:41:09 +00:00
Amit Mahajan
4d49e3f5b1 Fix to show signal strength as 0 if out of service.
Bug: 17942583
Change-Id: I399e5352b4585cff42ee5c7dd164315c1797110a
2014-10-10 14:40:44 -07:00
Alan Viverette
48dd1bca69 Add option for serif monospace captioning font
BUG: 17666124
Change-Id: I57e3938d16e162165caee7ec9373c59c824cd1da
2014-10-10 12:24:45 -07:00
Dianne Hackborn
8541206e6b am a4204bde: Merge "Update to use "real" L codename." into lmp-dev
* commit 'a4204bde454bbac665c7c1302056c9a64f76ffb1':
  Update to use "real" L codename.
2014-10-09 19:29:33 +00:00
Zoltan Szatmary-Ban
95dda800a9 am 50263efb: Remove CA Cert UI item from one list only
* commit '50263efbaf5ce432c7335c1428ca10c1096cce1f':
  Remove CA Cert UI item from one list only
2014-10-09 19:11:25 +00:00
Dianne Hackborn
a4204bde45 Merge "Update to use "real" L codename." into lmp-dev 2014-10-09 16:54:16 +00:00
Zoltan Szatmary-Ban
50263efbaf Remove CA Cert UI item from one list only
When removing a CA Cert in TrustedCredentialsSettings the UI item
is now removed from the list of the respective profile only.

Bug: 17926190
Change-Id: I7f7ae3498717cc457cb9e360e59bb365225b0cb6
2014-10-09 13:00:32 +01:00
Sanket Padawe
e4cbb86596 Merge "Removing display number format from SIM UI" into lmp-sprout-dev 2014-10-09 00:33:10 +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
Dianne Hackborn
308c8fdfec Update to use "real" L codename.
Change-Id: If7112bc4a41007bd3dbcb2b4d2c9ff9e44f7cf0c
2014-10-08 15:48:25 -07:00
Amith Yamasani
c55c581a8a am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev
* commit '742a6803c31692f6cf0b36ef934cf1e9bc9b01d8':
  Set default restrictions for a newly created user
2014-10-07 19:58:24 +00:00
Amith Yamasani
742a6803c3 Merge "Set default restrictions for a newly created user" into lmp-dev 2014-10-07 17:41:10 +00:00
Amith Yamasani
a766bfa3de Set default restrictions for a newly created user
Call a different createUser version that sets up the defaults.
Make sure any previously created guest also gets the restrictions
as soon as they are changed.

Bug: 17832802
Bug: 17891763
Change-Id: I3eaa9e3da32b2f436699db24bb7be2668f1480b3
2014-10-07 17:13:16 +00:00
Geoff Mendal
237abb0a37 am 7096c2dd: (-s ours) Import translations. DO NOT MERGE
* commit '7096c2dd0b1fadabe6f2bcb07ef5045405f2337f':
  Import translations. DO NOT MERGE
2014-10-07 00:08:25 +00:00
Geoff Mendal
c3cd6d956b Import translations. DO NOT MERGE
Change-Id: I86bdfc2ed82420c69d8123d82c3e376eef9ff2b1
Auto-generated-cl: translation import
2014-10-06 17:04:43 -07:00
Geoff Mendal
7096c2dd0b Import translations. DO NOT MERGE
Change-Id: I081acd53e6011744f1fdf01403290172ac9ab96f
Auto-generated-cl: translation import
2014-10-06 16:53:34 -07:00
Baligh Uddin
b305e7adec am 43848de1: (-s ours) Import translations. DO NOT MERGE
* commit '43848de1603dc30e390049e2057285303132a836':
  Import translations. DO NOT MERGE
2014-10-05 18:10:55 +00:00
Baligh Uddin
4aed423562 Import translations. DO NOT MERGE
Change-Id: I9049c251a4ee54d87835a2a4a892c15ddf313a1e
Auto-generated-cl: translation import
2014-10-04 21:38:39 -07:00
Baligh Uddin
43848de160 Import translations. DO NOT MERGE
Change-Id: Iebb3a9a429b160434faeae21a112480e888c6bb4
Auto-generated-cl: translation import
2014-10-04 21:30:28 -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
Svetoslav
35314f2771 am 5cdd3f4f: Update accessibility plus secure lock warning messages.
* commit '5cdd3f4f6fcee6af89742dc0427df4bba4214cc8':
  Update accessibility plus secure lock warning messages.
2014-10-03 22:06:18 +00:00
Svetoslav
5cdd3f4f6f Update accessibility plus secure lock warning messages.
bug:17671790

Change-Id: I694586452963a8f0e4c86b5c9c807ca9bb2ec15d
2014-10-03 13:27:13 -07:00
John Spurlock
40fdd48204 am c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-dev
* commit 'c05b739c691684350b63ca2e232319ee4fcaa76d':
  Settings: Update media & alarm stream icons.
2014-10-03 14:00:25 +00:00
John Spurlock
c05b739c69 Merge "Settings: Update media & alarm stream icons." into lmp-dev 2014-10-03 13:55:35 +00:00
PauloftheWest
32ce9484b7 am 6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec.
* commit '6e26427e521a79a11c1a9e1b64995494290eaf7c':
  Updated Wi-Fi hotspot dialog to the Material Spec.
2014-10-03 13:46:28 +00:00
John Spurlock
e2356b99a1 Settings: Update media & alarm stream icons.
Update icon pointers and remove obsolete preference class.

Bug: 17762712
Change-Id: Ia4b96c5b38f2a73a7a339b2ab3abfcd433f4403d
2014-10-02 20:06:48 -04:00
Wink Saville
dbd052ed5e Enable Sim Settings
Changes from Paul and MTK will be coming soon but this
allow us to do some initial testing.

Change-Id: Ic52bc3656bc7066c8bbb7435eaf14e9b8e66a257
2014-10-02 15:54:21 -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
PauloftheWest
c744c448e4 am 59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
* commit '59d33dbd25d8ca968e03bdeefedea9b0fe2e01f3':
  Fixed a Setting Bluetooth Airplane mode bug.
2014-10-01 21:12:30 +00:00
PauloftheWest
59d33dbd25 Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev 2014-10-01 21:07:56 +00:00
Alan Viverette
91f4e5a8af am 7a4d229d: Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev
* commit '7a4d229d2dd958fe033c739785eae6728caa5184':
  Ensure recycled APN preferences are updated to show radio button
2014-10-01 20:12:01 +00:00
Alan Viverette
7a4d229d2d Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev 2014-10-01 20:05:21 +00:00
Alan Viverette
3cf5d1ea71 Ensure recycled APN preferences are updated to show radio button
BUG: 17516352
Change-Id: I5da19b7c6d5a3ec03fe24f7bdfda656d6d616342
2014-10-01 12:43:10 -07:00
Baligh Uddin
299c6e127d am 9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '9d4dc326d1988ef2760e9d0d31239e43801587e2':
  Import translations. DO NOT MERGE
2014-10-01 19:32:32 +00:00
Baligh Uddin
0905bb07fc Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-01 19:29:16 +00:00
Baligh Uddin
9d4dc326d1 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-01 19:29:10 +00:00
Hui Shu
c1c9888db4 am 905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
* commit '905f9e2f90c886a8405e0cca8286cd3dd7f430e9':
  Remove WebView DRP Setting from Developer Settings
2014-10-01 18:32:04 +00:00
Hui Shu
905f9e2f90 Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 2014-10-01 18:28:52 +00:00
Zoltan Szatmary-Ban
45f8ffa1da am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
* commit 'b0c216d3b95b3aa3a0a38ebde92ec19956598e9d':
  Disambiguate categories in Settings > Trusted Credentials
2014-10-01 17:02:07 +00:00
Zoltan Szatmary-Ban
b0c216d3b9 Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev 2014-10-01 15:48:00 +00:00
PauloftheWest
797fc45ff6 Fixed a Setting Bluetooth Airplane mode bug.
+ This patch moves the switch listeners from setup/teardown of the SwitchBar
to pause/resume of Bluetooth Settings.  This prevents Bluetooth from
receiving connect messages while Airplane mode is turning off Bluetooth
(which is what caused Bluetooth to re-enable.)

Bug: 17465951
Change-Id: I4d32fcf5bb3a2241ed03e2295c86390e15743954
2014-10-01 08:23:40 -07:00
Maurice Lam
5fdb8fa41d am f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev
* commit 'f7b567081ef5f4daafdf0b229793323751e0d764':
  [WifiSetup] Update background texture
2014-10-01 15:03:19 +00:00
Svetoslav
42eff3b7e6 am 52448442: Use default encryption password if an accessibility service is enabled.
* commit '524484426855f814ff1f3189fd5221dd630dbf8c':
  Use default encryption password if an accessibility service is enabled.
2014-10-01 15:02:20 +00:00
Fabrice Di Meglio
976aba99c8 am fc14e272: Merge "Update Settings App icons" into lmp-dev
* commit 'fc14e272aaed6a6e36c044b93e12d68896aaa543':
  Update Settings App icons
2014-10-01 15:00:30 +00:00
PauloftheWest
cc6736bfde am 29aab7a2: Fixed a Settings crash.
* commit '29aab7a2ad3cabdc1681fdc93a0f00b20072d385':
  Fixed a Settings crash.
2014-10-01 14:58:41 +00:00