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

9386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Wren
6ba109b14a am 13d3d371: am 8bea3c3f: Merge "move remaining dock settings into sound settings fragment." into jb-mr1-dev 
* commit '13d3d371b12d7d5b3478e0c1f9989de5d7972885':
  move remaining dock settings into sound settings fragment.
 2012-09-24 14:40:54 -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
Adam Cohen
d1898e1796 am e3ee2823: am 85d4b5f7: Ensuring that keyguard widgets are bound with correct options 
* commit 'e3ee28239712553face2e80cb69f62b616a84ab2':
  Ensuring that keyguard widgets are bound with correct options
 2012-09-24 14:12:13 -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
Adam Cohen
e3ee282397 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:37 -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
e15abb7bb1 am bad0a648: am ff571fee: Merge "Hide lockdown VPN when IMS auth is required." into jb-mr1-dev 
* commit 'bad0a648a7f677f5bbf7e94a5d3d6f7fcd4a4370':
  Hide lockdown VPN when IMS auth is required.
 2012-09-24 13:13:43 -07:00
Jeff Sharkey
bad0a648a7 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 13:11:19 -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
a85ffcf5ac am 6f2f479c: am c939735b: Merge "Addressing issue where power control widget disappears issue 7205586" into jb-mr1-dev 
* commit '6f2f479c5cdeecec96a496fd75288b7eced4a0c5':
  Addressing issue where power control widget disappears issue 7205586
 2012-09-24 11:53:35 -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
6f2f479c5c 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:19 -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
The Android Open Source Project
51e3e50acd am dde890a6: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'dde890a6d34b40eac75a018b659221216e5c7203':
 2012-09-24 10:18:44 -07:00
The Android Open Source Project
dde890a6d3 Reconcile with jb-mr1-release - do not merge 
Change-Id: I736712a26a0e9991d500f7f654eb12dbbd511db4
 2012-09-24 10:13:39 -07:00
Amith Yamasani
f3db3ea04b am 16a6fd4b: am 7fb91855: Merge "Show more settings and add restrictions/dialogs for secondary users" into jb-mr1-dev 
* commit '16a6fd4bb43927bdabe3ed7985b5efedaaf659e4':
  Show more settings and add restrictions/dialogs for secondary users
 2012-09-24 09:33:50 -07:00
Jeff Sharkey
150ccef5a4 am c912f5c6: am 0e9cf8a7: Storage item to represent cached data. 
* commit 'c912f5c6ab48b6ba81a79af561b571faa6396526':
  Storage item to represent cached data.
 2012-09-24 09:33:49 -07:00
Baligh Uddin
fd6b66020b am fb6cea75: (-s ours) am b1055311: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'fb6cea755cb61ba20298ba0c5935f83cb385fdf2':
  Import translations. DO NOT MERGE
 2012-09-24 09:33:48 -07:00
Baligh Uddin
84964f1259 am dea83bdd: am 17b7a8cd: Merge "Remove no longer used dream_settings.xml." into jb-mr1-dev 
* commit 'dea83bdd138e083e2d3207ae9e52bc5f73a57e82':
  Remove no longer used dream_settings.xml.
 2012-09-24 09:33:47 -07:00
Romain Guy
9a38e484e7 am 4be0fe59: am 70edd393: Merge "Add new developer setting to visualize overdraw" into jb-mr1-dev 
* commit '4be0fe59d9c9c61acc248464957dcd2e9f18abca':
  Add new developer setting to visualize overdraw
 2012-09-24 09:33:46 -07:00
Svetoslav Ganov
7253131c04 am dd381701: am f85e7e15: Merge "Accessibility multi-user support." into jb-mr1-dev 
* commit 'dd381701db67697ac8ccd5e2d01aeba2ff92cbcd':
  Accessibility multi-user support.
 2012-09-24 09:33:44 -07:00
Amith Yamasani
16a6fd4bb4 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 09:26:01 -07:00
Jeff Sharkey
c912f5c6ab am 0e9cf8a7: Storage item to represent cached data. 
* commit '0e9cf8a723c3e03207e905e8e03303ec4b5526dc':
  Storage item to represent cached data.
 2012-09-24 09:26:00 -07:00
Baligh Uddin
fb6cea755c am b1055311: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'b105531116148d5d29e113e611ac180aa9691c6e':
  Import translations. DO NOT MERGE
 2012-09-24 09:25:58 -07:00
Baligh Uddin
dea83bdd13 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 09:25:57 -07:00
Romain Guy
4be0fe59d9 am 70edd393: Merge "Add new developer setting to visualize overdraw" into jb-mr1-dev 
* commit '70edd393bf6590647c12808e20efa928eba96705':
  Add new developer setting to visualize overdraw
 2012-09-24 09:25:56 -07:00
Svetoslav Ganov
dd381701db am f85e7e15: Merge "Accessibility multi-user support." into jb-mr1-dev 
* commit 'f85e7e15a75d5a475e10940e1b3d570210729b64':
  Accessibility multi-user support.
 2012-09-24 09:25:55 -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
Romain Guy
d92f64652a am 70edd393: Merge "Add new developer setting to visualize overdraw" into jb-mr1-dev 
* commit '70edd393bf6590647c12808e20efa928eba96705':
  Add new developer setting to visualize overdraw
 2012-09-24 08:32:05 -07:00
Svetoslav Ganov
e734da88d6 am f85e7e15: Merge "Accessibility multi-user support." into jb-mr1-dev 
* commit 'f85e7e15a75d5a475e10940e1b3d570210729b64':
  Accessibility multi-user support.
 2012-09-24 08:32:03 -07:00
The Android Automerger
ca88cda071 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-24 06:59:22 -07:00
Svetoslav Ganov
29dd06463a am 1bd69f9a: am 0a48c169: Merge "Remove accessibility category from developer options." into jb-mr1-dev 
* commit '1bd69f9abab775ec1aceee53153c3a7e5aa329ec':
  Remove accessibility category from developer options.
 2012-09-24 00:52:10 -07:00
Dianne Hackborn
d592ce2974 am 3fea2123: am f4bd1a70: Merge "Fix issue 7198767, 7198366, 7189824." into jb-mr1-dev 
* commit '3fea2123960fd7d0f2d766f16a8bdb69e570355a':
  Fix issue 7198767, 7198366, 7189824.
 2012-09-24 00:52:04 -07:00
Baligh Uddin
81cace918c am e6bb67f8: (-s ours) am 936186c6: Revert "Import translations. DO NOT MERGE" 
* commit 'e6bb67f811eac5dcc93f417a2eade0a6d4905abf':
  Revert "Import translations. DO NOT MERGE"
 2012-09-24 00:51:49 -07:00
Baligh Uddin
9d43b57610 am fb7cb4d3: (-s ours) am 8172ea49: Import translations. DO NOT MERGE 
* commit 'fb7cb4d3ddeb6d4250cd4d02d05a705030b0dc21':
  Import translations. DO NOT MERGE
 2012-09-24 00:51:22 -07:00
Lei Zhang
97679dc270 Fix build. Revert "Import translations. DO NOT MERGE" 
This reverts commit b5153f6d83

Change-Id: I5f6803c413c1037d5ef90ff15949d5da9cfc43cb
 2012-09-24 00:09:04 -07:00
The Android Automerger
b44bdb2f59 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-23 19:00:18 -07:00
Amith Yamasani
7fb91855b0 Merge "Show more settings and add restrictions/dialogs for secondary users" into jb-mr1-dev 2012-09-23 18:47:20 -07:00
Amith Yamasani
9627a8ea15 Show more settings and add restrictions/dialogs for secondary users 
Bug: 7213029 crash in About>Status
Bug: 7212495 hide System updates for second user
Bug: 7212230 nickname editor should select the text
Bug: 7160487 TTS settings
Bug: 7129411 Settings needs visibility changes for secondary users

Change-Id: Ia2d1229c08b392edfa6b671fce4a382410405b14
 2012-09-23 18:43:31 -07:00
Jeff Sharkey
0e9cf8a723 Storage item to represent cached data. 
When touched, offers to clear all cached data.

Bug: 7216370
Change-Id: I86afe66b819fb7deeba909bef507925fc5a590f3
 2012-09-23 17:49:31 -07:00
Baligh Uddin
b105531116 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-23 08:14:05 -07:00
Baligh Uddin
17b7a8cd18 Merge "Remove no longer used dream_settings.xml." into jb-mr1-dev 2012-09-23 08:13:38 -07:00