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

9400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
74c1d328e2 Avoid using hardcoded strings. 
Bug: 7204211
Change-Id: Ida5f93719aad472964386f3591518547ddf32f94
 2012-09-26 15:24:28 -07:00
Chris Wren
4a10ca3b37 am b402c81a: am 99f98bb1: Merge "show the dream enable switch in all conditions." into jb-mr1-dev 
* commit 'b402c81a21e69798e78fdaa17d856c05bf1c8735':
  show the dream enable switch in all conditions.
 2012-09-26 13:21:24 -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
b402c81a21 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:19:53 -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
31ca3e44a4 am 1746d3a7: am 6f2ca5bc: Merge "Show more security settings, and fix missing summary in widget selection." into jb-mr1-dev 
* commit '1746d3a7346492a92ae1008eea33b26ffb8a1479':
  Show more security settings, and fix missing summary in widget selection.
 2012-09-26 11:51:57 -07: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
288bb7b144 am 0ebbd1d4: am d33caa4d: Dream settings now looks for the settings activity in xml. 
* commit '0ebbd1d44f94ae093378f31b1812c8c45f7cb785':
  Dream settings now looks for the settings activity in xml.
 2012-09-26 11:21:55 -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
The Android Open Source Project
b439a03321 am a064fa39: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'a064fa39ff593f97b084b3fdc723110bd39e4ee9':
  Fix regression in Bluetooth settings.
  Addressing issue where power control widget disappears issue 7205586
 2012-09-26 10:07:52 -07:00
John Spurlock
8d83ff55bd am fedb8a07: am 49dc9825: Prepare settings for METADATA_NAME_CONFIG_ACTIVITY removal. 
* commit 'fedb8a078954cf7e9b4780f5cd90bd7f827d987a':
  Prepare settings for METADATA_NAME_CONFIG_ACTIVITY removal.
 2012-09-26 10:07:25 -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
fb2424980e am f1d04777: (-s ours) am bf7fe20d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'f1d04777fcae037d50393c8cec544bed0cf05f16':
  Import translations. DO NOT MERGE
 2012-09-25 21:14:39 -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
Baligh Uddin
a4123755ee Merge "Import translations. DO NOT MERGE" 2012-09-25 19:44:20 -07:00
Svetoslav Ganov
82a2de3562 am 6b77eb2d: am 12fda43f: Merge "Show long message for a new user only once." into jb-mr1-dev 
* commit '6b77eb2d691e2ad476d66c3dfb8cb678c1ca2e1d':
  Show long message for a new user only once.
 2012-09-25 18:21:21 -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
d5778f2aac am 85f7ac3f: am 0d9179c4: Merge "You section title for current user details" into jb-mr1-dev 
* commit '85f7ac3f63c4c7282e89e444d08829627e6a9c1a':
  You section title for current user details
 2012-09-25 17:22:54 -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
9c29a3f981 am 8b9f0fda: am 209898da: Merge "Update references to migrated global settings." into jb-mr1-dev 
* commit '8b9f0fda101426bfb275d3bb1a005781e58ce797':
  Update references to migrated global settings.
 2012-09-25 17:09:26 -07:00
Jeff Brown
48f4391bc7 am 46db3716: am 6a5e32a6: Merge "Move OVERLAY_DISPLAY_DEVICES to Global." into jb-mr1-dev 
* commit '46db3716212076e758924b3dd599550207d1a3c4':
  Move OVERLAY_DISPLAY_DEVICES to Global.
 2012-09-25 17:09:24 -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
4bc3d18d8b am fb357694: am cd207ad4: Merge "Fix regression in Bluetooth settings." into jb-mr1-dev 
* commit 'fb357694450dae7c0bca21904c6e641195493465':
  Fix regression in Bluetooth settings.
 2012-09-25 16:33:25 -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
Baligh Uddin
47d1d19f6d Import translations. DO NOT MERGE 
Change-Id: I0ce766e5ccb68544d1a32a6b1d2b0009f194870c
Auto-generated-cl: translation import
 2012-09-25 16:12:06 -07:00