PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,311 Commits 1 Branch 0 Tags
ff5b96fb19e3a56a8803547a0c9cd11cfd97746c
Commit Graph

9311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
1746d3a734 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:50:14 -07: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
0ebbd1d44f 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:57 -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
The Android Open Source Project
a064fa39ff Reconcile with jb-mr1-release - do not merge 
Change-Id: I5722eee1f2907148388f35abfa36517177ca8f50
 2012-09-26 09:08:37 -07: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
fedb8a0789 am 49dc9825: Prepare settings for METADATA_NAME_CONFIG_ACTIVITY removal. 
* commit '49dc9825569d0c555466303d7d78f1bc75e1602b':
  Prepare settings for METADATA_NAME_CONFIG_ACTIVITY removal.
 2012-09-26 08:24:51 -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
The Android Automerger
07d58df96e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-26 07:00:18 -07: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
f1d04777fc am bf7fe20d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'bf7fe20d5b66e30523a3ba7c84a69350709644d5':
  Import translations. DO NOT MERGE
 2012-09-25 21:13:33 -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
6b77eb2d69 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:14 -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
Jeff Brown
c41d69f56f Fix regression in Bluetooth settings. 
Bug: 7207090
Change-Id: Ie14a1d36a61b571766d2025ed7d8079712727690
 2012-09-25 17:35:47 -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
85f7ac3f63 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:15 -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
8b9f0fda10 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:07:48 -07:00
Jeff Brown
46db371621 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:07:41 -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
fb35769445 am cd207ad4: Merge "Fix regression in Bluetooth settings." into jb-mr1-dev 
* commit 'cd207ad437085fe3757259bd708fe74f68179094':
  Fix regression in Bluetooth settings.
 2012-09-25 16:30:55 -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
d31a096901 am 16398c9c: UI refinements to security screen widgets interface 
* commit '16398c9c973ba16a14455c4eee9ca162e0273792':
  UI refinements to security screen widgets interface
 2012-09-25 14:35:31 -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
The Android Automerger
a27ec92c2d merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-25 07:00:27 -07:00
Jeff Brown
a17a5b814f Fix regression in Bluetooth settings. 
Bug: 7207090
Change-Id: Ie14a1d36a61b571766d2025ed7d8079712727690
 2012-09-24 20:33:51 -07:00
Adam Cohen
085d9b0db0 Addressing issue where power control widget disappears issue 7205586 
Change-Id: I6eea146d3819d3b35f1420e59d4ebdbc66041a9e
 2012-09-24 16:49:01 -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
13d3d371b1 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:38:56 -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