summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add flag to allow testing launcher widgets in keyguard.Jim Miller2012-09-171-2/+7
| | | | Change-Id: I10fc3f6557dba9261b898d7b123d1391c1afdf06
* Data usage multi-user support.Jeff Sharkey2012-09-144-56/+104
| | | | | | | | | | | | | Switch to storing policy per-user instead of per-app, meaning each user has control over their own set of apps. Summarize the usage of non-current users. Only allow owner to make changes to overall network policy. Hide auto-sync menu when viewing app details. Search for MANAGE_NETWORK_USAGE intent across all package names sharing a UID. Bug: 7121279, 5419594, 6978663 Change-Id: Ia70f04df70d27da27faccb947cd27021c628a41a
* Correct strings for Plaform Anti-malwarerich cannings2012-09-141-1/+1
| | | | | | | | | | Set strings to: Verify apps Disallow or warn before installation of apps that may cause harm Bug: 7168682 Change-Id: Ic0102dd82ec26dd7239eaeaa7daa2b2f47fd6365
* Merge "Fix crash in Settings > Security" into jb-mr1-devMichael Jurka2012-09-141-13/+15
|\
| * Fix crash in Settings > SecurityMichael Jurka2012-09-141-13/+15
| | | | | | | | Change-Id: Ib439c652f4f8a55cac710dbd22792943a7ef8f98
* | Merge "Watch for profile changes and push to user manager" into jb-mr1-devAmith Yamasani2012-09-143-53/+126
|\ \
| * | Watch for profile changes and push to user managerAmith Yamasani2012-09-133-53/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Treat cache storage usage as available space." into jb-mr1-devJeff Sharkey2012-09-142-16/+33
|\ \ \ | |_|/ |/| |
| * | Treat cache storage usage as available space.Jeff Sharkey2012-09-142-16/+33
| |/ | | | | | | | | Bug: 7123160 Change-Id: I1b3f36622be557d7c47f1452832f67da40893a02
* | Add support for setting lock widgetsMichael Jurka2012-09-148-25/+170
| | | | | | Change-Id: I26165f1bc60e3cf277dbdd4f627ac720b492ffde
* | Merge "Adding ability to filter for certain types of widgets in picker ↵Michael Jurka2012-09-141-11/+39
|\ \ | | | | | | | | | activity" into jb-mr1-dev
| * | Adding ability to filter for certain types of widgets in picker activityAdam Cohen2012-09-111-11/+39
| | | | | | | | | | | | Change-Id: I92d8748b62ef017b6cd36ff377958c09c9f097c9
* | | Merge "Protect self from async change of BluetoothPan" into jb-mr1-devRobert Greenwalt2012-09-141-26/+36
|\ \ \ | |_|/ |/| |
| * | Protect self from async change of BluetoothPanRobert Greenwalt2012-09-141-26/+36
| | | | | | | | | | | | | | | bug:6945678 Change-Id: I627a55aea9170f889823a38c8e2bb08a06faa841
* | | Merge "Multi-user battery settings." into jb-mr1-devDianne Hackborn2012-09-136-20/+89
|\ \ \ | |/ / |/| |
| * | Multi-user battery settings.Dianne Hackborn2012-09-126-20/+89
| | | | | | | | | | | | | | | | | | Aggregates battery use from other users into one line item. Change-Id: I811e681891a9ff098491de1e096232f38bf061a9
* | | Merge "Iteration on multi-user Storage UI." into jb-mr1-devJeff Sharkey2012-09-137-591/+426
|\ \ \ | |/ / |/| |
| * | Iteration on multi-user Storage UI.Jeff Sharkey2012-09-137-591/+426
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Don't crash during setup of secondary users" into jb-mr1-devChristopher Tate2012-09-121-1/+1
|\ \ \
| * | | Don't crash during setup of secondary usersChristopher Tate2012-09-121-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Tell contacts to return back to Settings when done editing the profile infoAmith Yamasani2012-09-121-0/+3
| | | | | | | | | | | | Change-Id: I643884af6c062788123b59a115ce6e398430e6b1
* | | Merge "Correct settings namespace for auto time/tz" into jb-mr1-devChristopher Tate2012-09-122-14/+14
|\ \ \
| * | | Correct settings namespace for auto time/tzChristopher Tate2012-09-122-14/+14
| |/ / | | | | | | | | | | | | | | | Bug 7148283 Change-Id: If585b16f5b6ea3046e64eb9c8355fa3c9fbeeada
* | | Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, ↵Fabrice Di Meglio2012-09-121-1/+2
|\ \ \ | |/ / |/| | | | | Hebrew, farsi)" into jb-mr1-dev
| * | Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)Fabrice Di Meglio2012-09-111-1/+2
| | | | | | | | | | | | | | | | | | - fix Data Usage text direction for list items Change-Id: I938fa77e7cfb2a900daa9f5d081c8e2fd63a42cf
* | | Include user identifier in external storage paths.Jeff Sharkey2012-09-113-30/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, ↵Fabrice Di Meglio2012-09-111-1/+2
|\ \ \ | |/ / | | | | | | Hebrew, farsi)" into jb-mr1-dev
| * | Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)Fabrice Di Meglio2012-09-111-1/+2
| | | | | | | | | | | | | | | | | | - fix "Network SSID" string direction Change-Id: I8491f8f9d52f80863ee78b645e2e34f5f5ff3656
* | | Merge "Wifi settings are in a different namespace now" into jb-mr1-devChristopher Tate2012-09-111-4/+4
|\ \ \
| * | | Wifi settings are in a different namespace nowChristopher Tate2012-09-111-4/+4
| | |/ | |/| | | | | | | | | | | | | Bug 7144874 Change-Id: I9d004f7e9d33c821fb64cf789036b6b4e0a23a8e
* | | Merge "Fix on/off switch for Android Beam." into jb-mr1-devMartijn Coenen2012-09-1152-626/+260
|\ \ \ | |/ / |/| |
| * | Fix on/off switch for Android Beam.Martijn Coenen2012-09-111-3/+13
| | | | | | | | | | | | | | | Bug: 7121720 Change-Id: Iec0f9ccfd439d11cfcc13afb45974ce1fd8778f0
| * | am ebca7f3e: am 6aeed784: am f587f5a5: am 78f5c4d5: am 76ddf411: Merge "Fix ↵Elliott Hughes2012-09-102-30/+85
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | /proc/version parsing in Settings." * commit 'ebca7f3e8e54391e33a5fa656cb96a0dfb2d3732': Fix /proc/version parsing in Settings.
| | * \ am 6aeed784: am f587f5a5: am 78f5c4d5: am 76ddf411: Merge "Fix /proc/version ↵Elliott Hughes2012-09-102-30/+85
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parsing in Settings." * commit '6aeed7846c5f428c56268d92b437679d683fed4a': Fix /proc/version parsing in Settings.
| * | \ \ am 43a5c62c: am a47a3c8d: Merge "Fix color of text in widget picker" into ↵Michael Jurka2012-09-101-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit '43a5c62ceb856dbc4ace1f85dfed276216217c8b': Fix color of text in widget picker
| | * | | am a47a3c8d: Merge "Fix color of text in widget picker" into jb-mr1-devMichael Jurka2012-09-101-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a47a3c8dea5212f95167b48be9a5f2af3d819c3a': Fix color of text in widget picker
| * | \ \ \ am 4e201cc6: am f7d76210: Merge "User management UI: take 2" into jb-mr1-devAmith Yamasani2012-09-1015-382/+521
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '4e201cc6eae8a03e7a8133f32eec9ef0ff4dd7d0': User management UI: take 2
| | * | | | am f7d76210: Merge "User management UI: take 2" into jb-mr1-devAmith Yamasani2012-09-1015-382/+521
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f7d7621022e97b516ce9d3a9c72de1780d43e556': User management UI: take 2
| * | \ \ \ \ am 3c76c467: am 6a5929b0: Update Settings app to use new namespace for ↵Christopher Tate2012-09-104-17/+19
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | airplane-mode settings * commit '3c76c467632194bc8bd4b8b69273ca4b5edf312d': Update Settings app to use new namespace for airplane-mode settings
| | * | | | | am 6a5929b0: Update Settings app to use new namespace for airplane-mode settingsChristopher Tate2012-09-104-17/+19
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6a5929b086a61a955a4a2f43f5fa251e8754ff4a': Update Settings app to use new namespace for airplane-mode settings
| * | \ \ \ \ \ am 8f113624: (-s ours) am 955f3477: Merge "Revert "Import translations. DO ↵Baligh Uddin2012-09-100-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE"" into jb-mr1-dev * commit '8f1136241df1544df54e653b007ca96da98ebae6': Revert "Import translations. DO NOT MERGE"
| | * | | | | | am 955f3477: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-devBaligh Uddin2012-09-1098-4419/+1679
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '955f3477a910f56132f341f6679c9157b0cd515c': Revert "Import translations. DO NOT MERGE"
| * | \ \ \ \ \ \ am dd3f01af: (-s ours) am 6ac5ace7: Merge "Import translations. DO NOT ↵Baligh Uddin2012-09-100-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into jb-mr1-dev * commit 'dd3f01afc3836b9955273f75a5d5fb63798be77f': Import translations. DO NOT MERGE
| | * | | | | | | am 6ac5ace7: Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-09-1098-1679/+4419
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6ac5ace7f04c550b9ce6427762f30eb901d05f1f': Import translations. DO NOT MERGE
| * | \ \ \ \ \ \ \ am e42e895d: am f217f18d: Merge "Dream Settings: Disable settings icon if ↵John Spurlock2012-09-101-0/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not selected." into jb-mr1-dev * commit 'e42e895d9cedc83b5a2c4a86e20e6a34613f3332': Dream Settings: Disable settings icon if not selected.
| | * | | | | | | | am f217f18d: Merge "Dream Settings: Disable settings icon if not selected." ↵John Spurlock2012-09-101-0/+2
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit 'f217f18d5e806f73ca572db14d8e3373a0027dbd': Dream Settings: Disable settings icon if not selected.
| * | | | | | | | | am 206f87c5: am cce52bd3: Merge "Fix NPE in bluetooth Permission Activity" ↵Matthew Xie2012-09-101-1/+8
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit '206f87c5b99c5653b83ba55682ab4dd622fbfe6c': Fix NPE in bluetooth Permission Activity
| | * | | | | | | | am cce52bd3: Merge "Fix NPE in bluetooth Permission Activity" into jb-mr1-devMatthew Xie2012-09-101-1/+8
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cce52bd3a5162326493e4374c9ddc4f333351da7': Fix NPE in bluetooth Permission Activity
| * | \ \ \ \ \ \ \ \ am 5b0e875d: am de101033: Merge "Fixed the display count of connected panu ↵Matthew Xie2012-09-101-6/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | device." into jb-mr1-dev * commit '5b0e875d2d50d5a805028f495262fcbab9773c11': Fixed the display count of connected panu device.
| | * | | | | | | | | am de101033: Merge "Fixed the display count of connected panu device." into ↵Matthew Xie2012-09-101-6/+1
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'de101033025c53ab8f16c31c57c003c757e47cec': Fixed the display count of connected panu device.
generated by cgit v1.1 at 2025-01-15 13:07:07 +0000