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

8589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
767597b28a Merge "Watch for profile changes and push to user manager" into jb-mr1-dev 2012-09-14 13:07:11 -07:00
Jeff Sharkey
949ea299ad am 3a932f33: Merge "Treat cache storage usage as available space." into jb-mr1-dev 
* commit '3a932f33223e54d619014afa3e34799bc6256b69':
  Treat cache storage usage as available space.
 2012-09-14 13:05:04 -07:00
Jeff Sharkey
93588f6323 am 3a932f33: Merge "Treat cache storage usage as available space." into jb-mr1-dev 
* commit '3a932f33223e54d619014afa3e34799bc6256b69':
  Treat cache storage usage as available space.
 2012-09-14 13:04:58 -07:00
Jeff Sharkey
3a932f3322 Merge "Treat cache storage usage as available space." into jb-mr1-dev 2012-09-14 13:03:27 -07:00
Jeff Sharkey
ec6e662688 Treat cache storage usage as available space. 
Bug: 7123160
Change-Id: I1b3f36622be557d7c47f1452832f67da40893a02
 2012-09-14 13:01:52 -07:00
Michael Jurka
37afcdc51b am 8227e303: Add support for setting lock widgets 
* commit '8227e303850d7c1162c62947b70d0592432b455e':
  Add support for setting lock widgets
 2012-09-14 12:47:01 -07:00
Michael Jurka
a733a653f6 am 8227e303: Add support for setting lock widgets 
* commit '8227e303850d7c1162c62947b70d0592432b455e':
  Add support for setting lock widgets
 2012-09-14 12:47:00 -07:00
Michael Jurka
8227e30385 Add support for setting lock widgets 
Change-Id: I26165f1bc60e3cf277dbdd4f627ac720b492ffde
 2012-09-14 12:44:20 -07:00
Michael Jurka
0150b90ec4 am a9286147: Merge "Adding ability to filter for certain types of widgets in picker activity" into jb-mr1-dev 
* commit 'a92861471d41a6cfae0c7e6825d02398fdbd0b42':
  Adding ability to filter for certain types of widgets in picker activity
 2012-09-14 12:21:49 -07:00
Michael Jurka
6940216295 am a9286147: Merge "Adding ability to filter for certain types of widgets in picker activity" into jb-mr1-dev 
* commit 'a92861471d41a6cfae0c7e6825d02398fdbd0b42':
  Adding ability to filter for certain types of widgets in picker activity
 2012-09-14 12:21:43 -07:00
Michael Jurka
a92861471d Merge "Adding ability to filter for certain types of widgets in picker activity" into jb-mr1-dev 2012-09-14 12:19:40 -07:00
Robert Greenwalt
0aff67acca am 9310f85d: Merge "Protect self from async change of BluetoothPan" into jb-mr1-dev 
* commit '9310f85dc7f5421f9ca6b1d644c8ddff792e8f37':
  Protect self from async change of BluetoothPan
 2012-09-14 10:55:54 -07:00
Robert Greenwalt
1495043cde am 9310f85d: Merge "Protect self from async change of BluetoothPan" into jb-mr1-dev 
* commit '9310f85dc7f5421f9ca6b1d644c8ddff792e8f37':
  Protect self from async change of BluetoothPan
 2012-09-14 10:55:47 -07:00
Robert Greenwalt
9310f85dc7 Merge "Protect self from async change of BluetoothPan" into jb-mr1-dev 2012-09-14 10:53:55 -07:00
Robert Greenwalt
f60b92bb41 Protect self from async change of BluetoothPan 
bug:6945678
Change-Id: I627a55aea9170f889823a38c8e2bb08a06faa841
 2012-09-14 10:40:20 -07:00
The Android Automerger
390b873f56 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-14 07:12:28 -07:00
Amith Yamasani
32dccbc23f Watch for profile changes and push to user manager 
If the contacts Me Profile changes, push a copy of the photo to
user manager for user by the user switcher.

Also use an async task to load the profile data.

Change-Id: Ie784114622038ff14e3feb70f2ff51c372eecb3f
 2012-09-13 23:32:35 -07:00
Dianne Hackborn
a955d2f41c am b6d7c9c6: Merge "Multi-user battery settings." into jb-mr1-dev 
* commit 'b6d7c9c6f93e3d50a3fc5ce2db900a10cbb258e4':
  Multi-user battery settings.
 2012-09-13 10:37:45 -07:00
Dianne Hackborn
1891411896 am b6d7c9c6: Merge "Multi-user battery settings." into jb-mr1-dev 
* commit 'b6d7c9c6f93e3d50a3fc5ce2db900a10cbb258e4':
  Multi-user battery settings.
 2012-09-13 10:37:39 -07:00
Dianne Hackborn
b6d7c9c6f9 Merge "Multi-user battery settings." into jb-mr1-dev 2012-09-13 10:36:14 -07:00
The Android Automerger
f642a6a221 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-13 07:00:17 -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
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
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