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

9727 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
577ee8c0e7 am d9c5310b: am 43db5267: Tell contacts to return back to Settings when done editing the profile info 
* commit 'd9c5310bfccdd964fc4e34ca8b4204c0008db1ba':
  Tell contacts to return back to Settings when done editing the profile info
 2012-09-13 03:21:37 -07:00
Jeff Sharkey
85453fbde6 am 4a095381: Merge "Iteration on multi-user Storage UI." into jb-mr1-dev 
* commit '4a0953818da25e2240d32136821d4ecb97f90ce1':
  Iteration on multi-user Storage UI.
 2012-09-13 01:32:58 -07:00
Jeff Sharkey
7786df0508 am 4a095381: Merge "Iteration on multi-user Storage UI." into jb-mr1-dev 
* commit '4a0953818da25e2240d32136821d4ecb97f90ce1':
  Iteration on multi-user Storage UI.
 2012-09-13 01:32:54 -07:00
Jeff Sharkey
4a0953818d Merge "Iteration on multi-user Storage UI." into jb-mr1-dev 2012-09-13 01:31:46 -07:00
Jeff Sharkey
da13ec0cb4 Iteration on multi-user Storage UI. 
Now that DefaultContainerService has visibility of external storage
for all users, we can measure internal storage in a single pass.
Internal storage measurement now iterates across all known users,
counting both apps and emulated storage usage.

Create MeasurementDetails object with documentation about what is
counted under various device configurations.  Generalize to measure
each Environment.DIRECTORY separately, so it can be combined as
needed.  General cleanup of how measurements are passed to UI.

Bug: 7003520
Change-Id: Ib89c185296a0c9debdc20beeaa98584d803a84e8
 2012-09-13 01:13:48 -07:00
Dianne Hackborn
52e56a2490 Multi-user battery settings. 
Aggregates battery use from other users into one line item.

Change-Id: I811e681891a9ff098491de1e096232f38bf061a9
 2012-09-12 21:45:18 -07:00
Christopher Tate
17a1a0e216 am 5f55c55b: am 4a596b19: Merge "Correct settings namespace for auto time/tz" into jb-mr1-dev 
* commit '5f55c55b3f419b2e848b44b372b5649d5873f2ff':
  Correct settings namespace for auto time/tz
 2012-09-12 17:03:24 -07:00
Fabrice Di Meglio
e5a3b60e37 am 3a84f707: am 01bd0f00: Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev 
* commit '3a84f70772df1d5c38a4fdd553add9a39ef2ddb6':
  Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
 2012-09-12 17:02:54 -07:00
The Android Open Source Project
599dc1d88f am c737e92d: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'c737e92d4573ae6809f86c812d563ab88fe95d8c':
  Wifi settings are in a different namespace now
  Update Settings app to use new namespace for airplane-mode settings
 2012-09-12 16:59:12 -07:00
Christopher Tate
cf50b24521 am 2001a179: Merge "Don\'t crash during setup of secondary users" into jb-mr1-dev 
* commit '2001a179cc0a0c42bd9fae21e51793c16f09d0ae':
  Don't crash during setup of secondary users
 2012-09-12 15:56:38 -07:00
Amith Yamasani
d9c5310bfc am 43db5267: Tell contacts to return back to Settings when done editing the profile info 
* commit '43db5267d6227cc008fc482ccd777e27ff292c42':
  Tell contacts to return back to Settings when done editing the profile info
 2012-09-12 15:56:37 -07:00
Christopher Tate
0f385e446b am 2001a179: Merge "Don\'t crash during setup of secondary users" into jb-mr1-dev 
* commit '2001a179cc0a0c42bd9fae21e51793c16f09d0ae':
  Don't crash during setup of secondary users
 2012-09-12 15:56:04 -07:00
Amith Yamasani
8c93fc41af am 43db5267: Tell contacts to return back to Settings when done editing the profile info 
* commit '43db5267d6227cc008fc482ccd777e27ff292c42':
  Tell contacts to return back to Settings when done editing the profile info
 2012-09-12 15:56:03 -07:00
Christopher Tate
2001a179cc Merge "Don't crash during setup of secondary users" into jb-mr1-dev 2012-09-12 15:54:29 -07:00
Amith Yamasani
43db5267d6 Tell contacts to return back to Settings when done editing the profile info 
Change-Id: I643884af6c062788123b59a115ce6e398430e6b1
 2012-09-12 15:53:54 -07:00
Jeff Sharkey
4e818fd468 am 0c717bd9: am fc76a78c: Include user identifier in external storage paths. 
* commit '0c717bd9530a9b483ca4f7698d8acf4b5ddf6bea':
  Include user identifier in external storage paths.
 2012-09-12 15:36:26 -07:00
Fabrice Di Meglio
04b6060e7d am c3682211: am cfc1bec2: Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev 
* commit 'c368221133f446503594616b45c15a6b350eed13':
  Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
 2012-09-12 15:35:16 -07:00
Christopher Tate
bd65d715f9 am 506c1015: am cb122bd1: Merge "Wifi settings are in a different namespace now" into jb-mr1-dev 
* commit '506c101577aa8a876b6d939833c34e3b7a6737d3':
  Wifi settings are in a different namespace now
 2012-09-12 15:28:48 -07:00
Martijn Coenen
d4577899e1 am 924ff036: (-s ours) am 44a3cb5c: Merge "Fix on/off switch for Android Beam." into jb-mr1-dev 
* commit '924ff0366a044e6c2dbe7bd926406bf22ed0baa2':
  Fix on/off switch for Android Beam.
 2012-09-12 15:28:42 -07:00
Amith Yamasani
95798d249e am f07f0d9b: am 6be075d6: Check the user limit before showing an ADD menu item 
* commit 'f07f0d9b53094483cb0b69c5fffa62e547a61e9c':
  Check the user limit before showing an ADD menu item
 2012-09-12 15:13:50 -07:00
Christopher Tate
0accb7f9ae am 4a596b19: Merge "Correct settings namespace for auto time/tz" into jb-mr1-dev 
* commit '4a596b19eb84d9c0fa76aeac863dd5271993d9ce':
  Correct settings namespace for auto time/tz
 2012-09-12 14:32:46 -07:00
Christopher Tate
5f55c55b3f am 4a596b19: Merge "Correct settings namespace for auto time/tz" into jb-mr1-dev 
* commit '4a596b19eb84d9c0fa76aeac863dd5271993d9ce':
  Correct settings namespace for auto time/tz
 2012-09-12 14:32:41 -07:00
Christopher Tate
4a596b19eb Merge "Correct settings namespace for auto time/tz" into jb-mr1-dev 2012-09-12 14:30:36 -07:00
Christopher Tate
df5a62e30b Don't crash during setup of secondary users 
Make sure to call super.onActivityCreated() even in the short-circuit
case where there's an early 'return'.  This has probably been broken
for a long time but was never exercised while bringing up a new-from-
scratch device, but is the usual code path now for secondary users.

Change-Id: I0c1a5116440908d65750133689507917307e1dcd
 2012-09-12 14:27:43 -07:00
Christopher Tate
f1c085899d Correct settings namespace for auto time/tz 
Bug 7148283

Change-Id: If585b16f5b6ea3046e64eb9c8355fa3c9fbeeada
 2012-09-12 14:25:46 -07:00
Fabrice Di Meglio
fd01e3fc47 am 01bd0f00: Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev 
* commit '01bd0f0017ed789fc47f665018a9c72c70cdb504':
  Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
 2012-09-12 13:28:17 -07:00
Fabrice Di Meglio
3a84f70772 am 01bd0f00: Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev 
* commit '01bd0f0017ed789fc47f665018a9c72c70cdb504':
  Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
 2012-09-12 13:27:39 -07:00
Fabrice Di Meglio
01bd0f0017 Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev 2012-09-12 13:26:23 -07:00
The Android Open Source Project
c737e92d45 Reconcile with jb-mr1-release - do not merge 
Change-Id: Iad38196cfc19e957bee42dad0dda94f9b9402328
 2012-09-12 07:41:35 -07:00
The Android Automerger
70d85c4edf merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-12 07:00:19 -07:00
Jeff Sharkey
22746ce3ec am fc76a78c: Include user identifier in external storage paths. 
* commit 'fc76a78c458ac90d7e050ffc233cf9e32a2d9c0b':
  Include user identifier in external storage paths.
 2012-09-11 23:38:35 -07:00
Jeff Sharkey
0c717bd953 am fc76a78c: Include user identifier in external storage paths. 
* commit 'fc76a78c458ac90d7e050ffc233cf9e32a2d9c0b':
  Include user identifier in external storage paths.
 2012-09-11 23:38:13 -07:00
Jeff Sharkey
fc76a78c45 Include user identifier in external storage paths. 
When building external storage paths, always include user in path
to enable cross-user paths and aid debugging.

Mostly changes so Storage doesn't crash; will take another UI
iteration pass soon.

Bug: 7131382
Change-Id: If7ec807f12a36eb8ed02a0fb94e8a0b3a6694f16
 2012-09-11 22:49:27 -07:00
Adam Cohen
8291c08c95 Adding ability to filter for certain types of widgets in picker activity 
Change-Id: I92d8748b62ef017b6cd36ff377958c09c9f097c9
 2012-09-11 18:41:01 -07:00
Fabrice Di Meglio
b806013283 Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi) 
- fix Data Usage text direction for list items

Change-Id: I938fa77e7cfb2a900daa9f5d081c8e2fd63a42cf
 2012-09-11 18:01:51 -07:00
Fabrice Di Meglio
aaf5dc50c5 am cfc1bec2: Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev 
* commit 'cfc1bec2e612df10ac5565ebc4382193a6a6c9f6':
  Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
 2012-09-11 17:15:19 -07:00
Fabrice Di Meglio
c368221133 am cfc1bec2: Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev 
* commit 'cfc1bec2e612df10ac5565ebc4382193a6a6c9f6':
  Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
 2012-09-11 17:15:05 -07:00
Fabrice Di Meglio
cfc1bec2e6 Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev 2012-09-11 17:13:53 -07:00
Fabrice Di Meglio
eab9150ca8 Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi) 
- fix "Network SSID" string direction

Change-Id: I8491f8f9d52f80863ee78b645e2e34f5f5ff3656
 2012-09-11 16:31:13 -07:00
Christopher Tate
7bbfc863c6 Wifi settings are in a different namespace now 
Bug 7144874

Change-Id: I9d004f7e9d33c821fb64cf789036b6b4e0a23a8e
 2012-09-11 16:17:27 -07:00
Christopher Tate
506c101577 am cb122bd1: Merge "Wifi settings are in a different namespace now" into jb-mr1-dev 
* commit 'cb122bd15a1b406e99e3760f01350367857f8f55':
  Wifi settings are in a different namespace now
 2012-09-11 15:02:23 -07:00
Christopher Tate
9be733faa8 am cb122bd1: Merge "Wifi settings are in a different namespace now" into jb-mr1-dev 
* commit 'cb122bd15a1b406e99e3760f01350367857f8f55':
  Wifi settings are in a different namespace now
 2012-09-11 15:01:32 -07:00
Christopher Tate
cb122bd15a Merge "Wifi settings are in a different namespace now" into jb-mr1-dev 2012-09-11 15:00:00 -07:00
Christopher Tate
acee16f5ce Wifi settings are in a different namespace now 
Bug 7144874

Change-Id: I9d004f7e9d33c821fb64cf789036b6b4e0a23a8e
 2012-09-11 14:53:25 -07:00
Martijn Coenen
de940136ad am 44a3cb5c: Merge "Fix on/off switch for Android Beam." into jb-mr1-dev 
* commit '44a3cb5cb81e40cc7b06b783bf4bd6ccd46452df': (33 commits)
  Fix on/off switch for Android Beam.
  Revert "Import translations. DO NOT MERGE"
  Import translations. DO NOT MERGE
  Revert "Import translations. DO NOT MERGE"
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Revert "Import translations. DO NOT MERGE"
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Show the license dialog only if the activity is still showing
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  ...
 2012-09-11 14:46:14 -07:00
Martijn Coenen
924ff0366a am 44a3cb5c: Merge "Fix on/off switch for Android Beam." into jb-mr1-dev 
* commit '44a3cb5cb81e40cc7b06b783bf4bd6ccd46452df': (30 commits)
  Fix on/off switch for Android Beam.
  Revert "Import translations. DO NOT MERGE"
  Import translations. DO NOT MERGE
  Revert "Import translations. DO NOT MERGE"
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Revert "Import translations. DO NOT MERGE"
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  ...
 2012-09-11 14:46:06 -07:00
Martijn Coenen
44a3cb5cb8 Merge "Fix on/off switch for Android Beam." into jb-mr1-dev 2012-09-11 14:43:57 -07:00
Martijn Coenen
e8c73b1ce1 Fix on/off switch for Android Beam. 
Bug: 7121720
Change-Id: Iec0f9ccfd439d11cfcc13afb45974ce1fd8778f0
 2012-09-11 14:40:15 -07:00
Amith Yamasani
a93d2e6a28 am 6be075d6: Check the user limit before showing an ADD menu item 
* commit '6be075d6c3de7a9fd28942e9e15f4790d0e73ca3':
  Check the user limit before showing an ADD menu item
 2012-09-11 11:11:28 -07:00
Amith Yamasani
f07f0d9b53 am 6be075d6: Check the user limit before showing an ADD menu item 
* commit '6be075d6c3de7a9fd28942e9e15f4790d0e73ca3':
  Check the user limit before showing an ADD menu item
 2012-09-11 11:11:20 -07:00