PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,318 Commits 1 Branch 0 Tags
e36e87cd32b55b02173f8434a5882401d8e5fd86
Commit Graph

8318 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Cohen
e36e87cd32 am 6956e4b0: am f4b6a682: Merge "Addressing issue 7243210, can\'t set status widget properly" into jb-mr1-dev 
* commit '6956e4b007a202a2ca6e81c224aada069d38fe5c':
  Addressing issue 7243210, can't set status widget properly
 2012-09-28 00:34:01 -07:00
Robert Greenwalt
57e1f4b859 am b02bc8e6: am fffc9bef: Merge "Precreate a data structure so it\'s never null." into jb-mr1-dev 
* commit 'b02bc8e6a007f42a0404d386477fc8f2852845eb':
  Precreate a data structure so it's never null.
 2012-09-28 00:33:59 -07:00
Baligh Uddin
14e942fc8c am 6238559e: (-s ours) am bfb5fa9e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '6238559ebb0f922aa461739e1ae8a6f5fd57e9cc':
  Import translations. DO NOT MERGE
 2012-09-28 00:33:03 -07:00
The Android Open Source Project
70b4532d52 am fca2ad6d: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'fca2ad6dfa28253e859ff9cfe4c2c80229d71a89':
 2012-09-28 00:32:54 -07:00
Baligh Uddin
a0e0c039bf Import translations. DO NOT MERGE 
Change-Id: I671c42c1630ec9692d14e0e588e303254c67386d
Auto-generated-cl: translation import
 2012-09-27 23:42:39 -07:00
Adam Cohen
6956e4b007 am f4b6a682: Merge "Addressing issue 7243210, can\'t set status widget properly" into jb-mr1-dev 
* commit 'f4b6a68215a0269837b73f134ff57cf150bc1d9c':
  Addressing issue 7243210, can't set status widget properly
 2012-09-27 13:16:36 -07:00
Adam Cohen
f4b6a68215 Merge "Addressing issue 7243210, can't set status widget properly" into jb-mr1-dev 2012-09-27 13:14:17 -07:00
Robert Greenwalt
b02bc8e6a0 am fffc9bef: Merge "Precreate a data structure so it\'s never null." into jb-mr1-dev 
* commit 'fffc9bef49428ac4974ed5c1ee2e4d0c0f9d4a5a':
  Precreate a data structure so it's never null.
 2012-09-27 13:12:57 -07:00
Robert Greenwalt
fffc9bef49 Merge "Precreate a data structure so it's never null." into jb-mr1-dev 2012-09-27 13:10:45 -07:00
Adam Cohen
eeb464ae43 Addressing issue 7243210, can't set status widget properly 
Change-Id: I863136bbef123f1c13d9e887840ca48ac7ccbf95
 2012-09-27 13:04:00 -07:00
Robert Greenwalt
88b0140241 Precreate a data structure so it's never null. 
Fixes NPE that the fast-fingered monkey sometimes triggers.
bug:7084178

Change-Id: Ibeb5e1ce678f59207de5dd321e06ae88ccc52216
 2012-09-27 11:21:12 -07:00
Baligh Uddin
b5b8a2db7e Merge "Import translations. DO NOT MERGE" 2012-09-27 10:08:45 -07:00
Baligh Uddin
6238559ebb am bfb5fa9e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'bfb5fa9ec37d58101febd13a334707f8f7e341f5':
  Import translations. DO NOT MERGE
 2012-09-27 10:05:42 -07:00
Baligh Uddin
bfb5fa9ec3 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-27 10:03:48 -07:00
The Android Open Source Project
fca2ad6dfa Reconcile with jb-mr1-release - do not merge 
Change-Id: I760c1f8381bb21e4f5f3b492b18a0e6d27dd531a
 2012-09-27 09:59:34 -07:00
The Android Automerger
a6ab0bd5e8 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-27 07:00:27 -07:00
Amith Yamasani
c866358410 am 0c3900af: am 04c4ec60: Merge "Show warning dialog in a multiuser system when adding a new account." into jb-mr1-dev 
* commit '0c3900af385a3d8b6d0102edfa51e26a0f4b6a19':
  Show warning dialog in a multiuser system when adding a new account.
 2012-09-26 22:04:22 -07:00
Amith Yamasani
0c3900af38 am 04c4ec60: Merge "Show warning dialog in a multiuser system when adding a new account." into jb-mr1-dev 
* commit '04c4ec607affecc16e3032327288f890bddad3db':
  Show warning dialog in a multiuser system when adding a new account.
 2012-09-26 22:02:48 -07:00
Amith Yamasani
04c4ec607a Merge "Show warning dialog in a multiuser system when adding a new account." into jb-mr1-dev 2012-09-26 22:01:19 -07:00
Jeff Sharkey
e38d3271c7 am 2a6668af: am 3db14139: Merge "Clean up Global settings stragglers." into jb-mr1-dev 
* commit '2a6668aff0a9e429d094f8f00fbbc60864f50c5c':
  Clean up Global settings stragglers.
 2012-09-26 20:22:58 -07:00
Jeff Sharkey
2a6668aff0 am 3db14139: Merge "Clean up Global settings stragglers." into jb-mr1-dev 
* commit '3db14139205d762ccf544c20ee2b4a04dd4de0da':
  Clean up Global settings stragglers.
 2012-09-26 20:16:54 -07:00
Jeff Sharkey
3db1413920 Merge "Clean up Global settings stragglers." into jb-mr1-dev 2012-09-26 20:15:20 -07:00
Baligh Uddin
74179ad106 Import translations. DO NOT MERGE 
Change-Id: I8cd48c0d3c7452d8dcd50f3c1f8e97d8ce168aaf
Auto-generated-cl: translation import
 2012-09-26 18:53:56 -07:00
Baligh Uddin
a9731af829 Import translations. DO NOT MERGE 
Change-Id: Ibdc7730e6559d27b4c9abd2e3cec90f2a0d97a76
Auto-generated-cl: translation import
 2012-09-26 18:51:25 -07:00
Amith Yamasani
eb71f26897 Show warning dialog in a multiuser system when adding a new account. 
Bug: 7207092

Change-Id: I95ac107dbc867490dd2e492291501fd3630d267c
 2012-09-26 18:02:54 -07:00
Jeff Brown
41be103950 am 4daf2f42: am 74c1d328: Avoid using hardcoded strings. 
* commit '4daf2f42a9c3a61d7d52cf7714829a5874b36236':
  Avoid using hardcoded strings.
 2012-09-26 17:31:21 -07:00
Jeff Brown
4daf2f42a9 am 74c1d328: Avoid using hardcoded strings. 
* commit '74c1d328e2e75265a2b106ef66618cf1eb60c914':
  Avoid using hardcoded strings.
 2012-09-26 17:28:50 -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
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
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
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
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
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
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
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