Commit Graph

8253 Commits

Author SHA1 Message Date
Jeff Brown
45bcaa0228 am 74c1d328: Avoid using hardcoded strings.
* commit '74c1d328e2e75265a2b106ef66618cf1eb60c914':
  Avoid using hardcoded strings.
2012-09-26 17:28:54 -07:00
Jeff Sharkey
08aafd445f Clean up Global settings stragglers.
Bug: 7242121
Change-Id: Ibe62c70f88c946e46a0604a6999b5ca18ac18a1e
2012-09-26 17:11:43 -07:00
Jeff Brown
74c1d328e2 Avoid using hardcoded strings.
Bug: 7204211
Change-Id: Ida5f93719aad472964386f3591518547ddf32f94
2012-09-26 15:24:28 -07:00
Chris Wren
331640d1ec am 99f98bb1: Merge "show the dream enable switch in all conditions." into jb-mr1-dev
* commit '99f98bb14607240a0e05997a18770912ade1587e':
  show the dream enable switch in all conditions.
2012-09-26 13:20:00 -07:00
Chris Wren
99f98bb146 Merge "show the dream enable switch in all conditions." into jb-mr1-dev 2012-09-26 13:18:02 -07:00
Chris Wren
63707af94a show the dream enable switch in all conditions.
Bug: 7229905
Change-Id: I3fc3b2e8ce1e8bb08c72daed9c5d33ce5ff343c6
2012-09-26 14:53:45 -04:00
Amith Yamasani
c78ee4b606 am 6f2ca5bc: Merge "Show more security settings, and fix missing summary in widget selection." into jb-mr1-dev
* commit '6f2ca5bc71d9afc531b60762b8676cacdb96fcaa':
  Show more security settings, and fix missing summary in widget selection.
2012-09-26 11:49:15 -07:00
Amith Yamasani
6f2ca5bc71 Merge "Show more security settings, and fix missing summary in widget selection." into jb-mr1-dev 2012-09-26 11:47:32 -07:00
John Spurlock
930d219d71 am d33caa4d: Dream settings now looks for the settings activity in xml.
* commit 'd33caa4dea521677431f86e719ac1df290a24c69':
  Dream settings now looks for the settings activity in xml.
2012-09-26 11:19:37 -07:00
John Spurlock
d33caa4dea Dream settings now looks for the settings activity in xml.
Uses the new api for obtaining dream metadata, no longer looks
for the settings activity using the old metadata key.

Bug:7172816
Change-Id: I5f9f9ea2a59df6a55c2f17bca5cdbe206f89d780
2012-09-26 12:40:54 -04:00
John Spurlock
68dfd96f50 am 49dc9825: Prepare settings for METADATA_NAME_CONFIG_ACTIVITY removal.
* commit '49dc9825569d0c555466303d7d78f1bc75e1602b':
  Prepare settings for METADATA_NAME_CONFIG_ACTIVITY removal.
2012-09-26 08:25:28 -07:00
John Spurlock
49dc982556 Prepare settings for METADATA_NAME_CONFIG_ACTIVITY removal.
This is to avoid even a temporary build breakage. Using the new
xml file will be done in a followup commit.

Bug:7172816
Change-Id: If6fedefbee38428eda5b39994c3ad8ff86c8fef9
2012-09-26 11:16:34 -04:00
Amith Yamasani
7fb4f850ea Show more security settings, and fix missing summary in widget selection.
Bug: 7232809
Change-Id: Ib7a67b83f455592ba5e0e48420924671f8ed95e8
2012-09-25 22:44:21 -07:00
Baligh Uddin
81957fc4b4 am bf7fe20d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'bf7fe20d5b66e30523a3ba7c84a69350709644d5':
  Import translations. DO NOT MERGE
2012-09-25 21:14:20 -07:00
Baligh Uddin
548423a164 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-09-25 21:13:16 -07:00
Baligh Uddin
bf7fe20d5b Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-25 21:12:30 -07:00
Svetoslav Ganov
4f6e506ccf am 12fda43f: Merge "Show long message for a new user only once." into jb-mr1-dev
* commit '12fda43f8564968cc93d0f8b5839fd520d33577d':
  Show long message for a new user only once.
2012-09-25 18:19:28 -07:00
Svetoslav Ganov
12fda43f85 Merge "Show long message for a new user only once." into jb-mr1-dev 2012-09-25 18:17:15 -07:00
Amith Yamasani
7743417516 am 0d9179c4: Merge "You section title for current user details" into jb-mr1-dev
* commit '0d9179c47338532bb2995130d07e458ab12bcb5c':
  You section title for current user details
2012-09-25 17:21:21 -07:00
Amith Yamasani
0d9179c473 Merge "You section title for current user details" into jb-mr1-dev 2012-09-25 17:18:21 -07:00
Jeff Brown
dd31ddc137 am 209898da: Merge "Update references to migrated global settings." into jb-mr1-dev
* commit '209898da754a0455864a9251723cb3ab91f36e46':
  Update references to migrated global settings.
2012-09-25 17:05:59 -07:00
Jeff Brown
cfc7fc1c69 am 6a5e32a6: Merge "Move OVERLAY_DISPLAY_DEVICES to Global." into jb-mr1-dev
* commit '6a5e32a658ac62e72092e3b5d8fb3b99cc4b5158':
  Move OVERLAY_DISPLAY_DEVICES to Global.
2012-09-25 17:05:50 -07:00
Jeff Brown
209898da75 Merge "Update references to migrated global settings." into jb-mr1-dev 2012-09-25 17:04:11 -07:00
Jeff Brown
6a5e32a658 Merge "Move OVERLAY_DISPLAY_DEVICES to Global." into jb-mr1-dev 2012-09-25 17:03:17 -07:00
Jeff Brown
b6caa06648 am cd207ad4: Merge "Fix regression in Bluetooth settings." into jb-mr1-dev
* commit 'cd207ad437085fe3757259bd708fe74f68179094':
  Fix regression in Bluetooth settings.
2012-09-25 16:30:07 -07:00
Jeff Brown
cd207ad437 Merge "Fix regression in Bluetooth settings." into jb-mr1-dev 2012-09-25 16:24:59 -07:00
Svetoslav Ganov
263f744237 Show long message for a new user only once.
1. We show a longer message only for the first added user. The
   longer message will be shown until the user has been created,
   which is until the creator pokes the OK button in the create
   new user dialog.

bug:7210780

Change-Id: Ifed4899048a8369f41f145af204a1e4e860f9b4c
2012-09-25 16:11:19 -07:00
Baligh Uddin
fe8e076e90 Import translations. DO NOT MERGE
Change-Id: Ic76cd17011c6da46ba5298eb2d1f081f7dc6f633
Auto-generated-cl: translation import
2012-09-25 16:09:15 -07:00
Baligh Uddin
c619f5aece Import translations. DO NOT MERGE
Change-Id: Ied12646ca5b4a822a07db7f09b6036a165d549fe
Auto-generated-cl: translation import
2012-09-25 16:07:01 -07:00
Amith Yamasani
3104b04e16 You section title for current user details
Bug: 7232244
Change-Id: I04904f423f236b4dcfc2e1c61618eb88b80b593c
2012-09-25 15:48:05 -07:00
Jeff Brown
a2806b661f Update references to migrated global settings.
Bug: 7231172
Change-Id: Ia4abbb6f897e93ebe38e6536fac7411b96eb2bb5
2012-09-25 15:22:01 -07:00
Jeff Brown
075cb30d4c Move OVERLAY_DISPLAY_DEVICES to Global.
Bug: 7127417
Change-Id: I9ed62e98754eba8a6107a5cac00f00f83904852d
2012-09-25 15:22:01 -07:00
Michael Jurka
732b246c95 am 16398c9c: UI refinements to security screen widgets interface
* commit '16398c9c973ba16a14455c4eee9ca162e0273792':
  UI refinements to security screen widgets interface
2012-09-25 14:35:15 -07:00
Robert Greenwalt
00798e6bcd Colorize premium sms ui.
bug:7205024
Change-Id: I1d32515d0822f5c96013708f26422d4700f7490b
2012-09-25 14:23:14 -07:00
Michael Jurka
16398c9c97 UI refinements to security screen widgets interface
Bug #7158868

Change-Id: Ia5be3986323119ea78b9e486b4d2e6e81bf145e7
2012-09-25 12:46:14 -07:00
Jeff Brown
a17a5b814f Fix regression in Bluetooth settings.
Bug: 7207090
Change-Id: Ie14a1d36a61b571766d2025ed7d8079712727690
2012-09-24 20:33:51 -07:00
Chris Wren
c4fab6f61f am 8bea3c3f: Merge "move remaining dock settings into sound settings fragment." into jb-mr1-dev
* commit '8bea3c3fb8b3ecbb33fbd5b159faaa7d229e7cf1':
  move remaining dock settings into sound settings fragment.
2012-09-24 14:39:06 -07:00
Chris Wren
8bea3c3fb8 Merge "move remaining dock settings into sound settings fragment." into jb-mr1-dev 2012-09-24 14:37:24 -07:00
Adam Cohen
0c2281e1a9 am 85d4b5f7: Ensuring that keyguard widgets are bound with correct options
* commit '85d4b5f78e831fdfe6da39f6edafd32c7d63dfea':
  Ensuring that keyguard widgets are bound with correct options
2012-09-24 14:10:57 -07:00
Jeff Sharkey
c295f455a2 am ff571fee: Merge "Hide lockdown VPN when IMS auth is required." into jb-mr1-dev
* commit 'ff571fee86267348e852a07826ffc78cc43384ba':
  Hide lockdown VPN when IMS auth is required.
2012-09-24 14:00:01 -07:00
Adam Cohen
85d4b5f78e Ensuring that keyguard widgets are bound with correct options
-> We need to bind the widget and indicate that it is a keyguard widget

Change-Id: I8e76b45b86aecc671669022c6f5fad071b62837d
2012-09-24 13:17:40 -07:00
Jeff Sharkey
ff571fee86 Merge "Hide lockdown VPN when IMS auth is required." into jb-mr1-dev 2012-09-24 13:08:56 -07:00
Chris Wren
2bc32ae808 move remaining dock settings into sound settings fragment.
Bug: 7016769
Change-Id: I21a7bf6140f7470dbb9bebeda1ebcc3f17c481c6
2012-09-24 15:57:10 -04:00
Jeff Sharkey
07d465ddb8 Hide lockdown VPN when IMS auth is required.
Bug: 7069782
Change-Id: I978d89894da17164a1e0122adb5acbfda3586fa1
2012-09-24 12:56:29 -07:00
Adam Cohen
56709207ce am c939735b: Merge "Addressing issue where power control widget disappears issue 7205586" into jb-mr1-dev
* commit 'c939735b176a3a401e8a3e60e9fd8a6a732a2dc0':
  Addressing issue where power control widget disappears issue 7205586
2012-09-24 11:51:31 -07:00
Adam Cohen
c939735b17 Merge "Addressing issue where power control widget disappears issue 7205586" into jb-mr1-dev 2012-09-24 11:49:24 -07:00
Amith Yamasani
8d1e4bef6f am 7fb91855: Merge "Show more settings and add restrictions/dialogs for secondary users" into jb-mr1-dev
* commit '7fb91855b05b312e45bfded72d48e0cffcee4a44':
  Show more settings and add restrictions/dialogs for secondary users
2012-09-24 08:32:09 -07:00
Jeff Sharkey
bbd5d2016b am 0e9cf8a7: Storage item to represent cached data.
* commit '0e9cf8a723c3e03207e905e8e03303ec4b5526dc':
  Storage item to represent cached data.
2012-09-24 08:32:08 -07:00
Baligh Uddin
70906b8efd am b1055311: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'b105531116148d5d29e113e611ac180aa9691c6e':
  Import translations. DO NOT MERGE
2012-09-24 08:32:07 -07:00
Baligh Uddin
06cd95e4d4 am 17b7a8cd: Merge "Remove no longer used dream_settings.xml." into jb-mr1-dev
* commit '17b7a8cd1895871441c86afef5387acfa3b81b57':
  Remove no longer used dream_settings.xml.
2012-09-24 08:32:06 -07:00