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
Michael Jurka
ce72ec7921 Fix crash in Settings > Security 
Change-Id: Ib439c652f4f8a55cac710dbd22792943a7ef8f98
 2012-09-14 14:09:16 -07:00
Baligh Uddin
4a44ed7bd7 Import translations. DO NOT MERGE 
Change-Id: I07c9987422c8e957459b8425f49d1e1fbd25190c
Auto-generated-cl: translation import
 2012-09-14 13:50:27 -07:00
Amith Yamasani
d477204da5 am 767597b2: Merge "Watch for profile changes and push to user manager" into jb-mr1-dev 
* commit '767597b28aebf46e42f7ce194acc09454d8d2324':
  Watch for profile changes and push to user manager
 2012-09-14 13:08:30 -07:00
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
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
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
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
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
da71d70922 am 18914118: am b6d7c9c6: Merge "Multi-user battery settings." into jb-mr1-dev 
* commit '18914118963b59705052049505b1862c367d3cf7':
  Multi-user battery settings.
 2012-09-13 14:12:11 -07:00
Jeff Sharkey
1a5b1f1e88 am 7786df05: am 4a095381: Merge "Iteration on multi-user Storage UI." into jb-mr1-dev 
* commit '7786df0508f1de403155a1518d99b509d59e763c':
  Iteration on multi-user Storage UI.
 2012-09-13 14:11:13 -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
Christopher Tate
6fa0dbb178 am cf50b245: am 2001a179: Merge "Don\'t crash during setup of secondary users" into jb-mr1-dev 
* commit 'cf50b2452191b043e86b513fa109e756c2c7e332':
  Don't crash during setup of secondary users
 2012-09-13 03:21:39 -07:00
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
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
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
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
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
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