OSDN Git Service
rich cannings [Sun, 16 Sep 2012 22:52:15 +0000 (15:52 -0700)]
am
d41fd604: Merge "Ability to hide verification settings" into jb-mr1-dev
* commit '
d41fd604cbf557d961f48a05fa40a9afc7b7cac6':
Ability to hide verification settings
rich cannings [Sun, 16 Sep 2012 22:50:08 +0000 (15:50 -0700)]
Merge "Ability to hide verification settings" into jb-mr1-dev
John Huang [Sun, 16 Sep 2012 21:33:18 +0000 (14:33 -0700)]
am
70c6e0fb: Merge "Add support for per-package policy for sending premium SMS." into jb-mr1-dev
* commit '
70c6e0fb33efd3ccedc5bac654296e6d556b5fd0':
Add support for per-package policy for sending premium SMS.
John Huang [Sun, 16 Sep 2012 21:31:18 +0000 (14:31 -0700)]
Merge "Add support for per-package policy for sending premium SMS." into jb-mr1-dev
Svetoslav Ganov [Sun, 16 Sep 2012 21:22:30 +0000 (14:22 -0700)]
am
260d930e: Merge "Updating the screen magnification description." into jb-mr1-dev
* commit '
260d930e304b768c31694521375876f11b8367f3':
Updating the screen magnification description.
Svetoslav Ganov [Sun, 16 Sep 2012 21:20:36 +0000 (14:20 -0700)]
Merge "Updating the screen magnification description." into jb-mr1-dev
Kenny Root [Sun, 16 Sep 2012 21:08:37 +0000 (14:08 -0700)]
am
cf008c28: Do not allow non-primary user to install certs
* commit '
cf008c28b871d4167e5aa19191ca691fb988f8fd':
Do not allow non-primary user to install certs
Kenny Root [Sun, 16 Sep 2012 21:01:43 +0000 (14:01 -0700)]
Do not allow non-primary user to install certs
Change-Id: Iefc2970ae23d8ce7d30717add211c01cde251c8d
rich cannings [Sun, 16 Sep 2012 20:58:07 +0000 (13:58 -0700)]
Ability to hide verification settings
Add a setting that controls the visibility of the package verification
setting in the Settings app.
Bug:
7022814
Change-Id: I6e503924adc112b4528d94b1e533baae6079e85e
Jeff Sharkey [Sat, 15 Sep 2012 23:11:19 +0000 (16:11 -0700)]
am
38305fb1: Data usage multi-user support.
* commit '
38305fb1777147cbcb86774c466e88434daff141':
Data usage multi-user support.
Jeff Sharkey [Fri, 14 Sep 2012 23:26:51 +0000 (16:26 -0700)]
Data usage multi-user support.
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
Svetoslav Ganov [Sat, 15 Sep 2012 02:41:05 +0000 (19:41 -0700)]
Updating the screen magnification description.
bug:
7054266
Change-Id: I59466d1e5c70a884badcfd0fdb01ffa3b920b7b7
Jake Hamby [Fri, 7 Sep 2012 00:41:34 +0000 (17:41 -0700)]
Add support for per-package policy for sending premium SMS.
The default behavior for sending a message to a premium SMS
short code (or suspected premium SMS number) is to ask the user for
confirmation. Enable the user to set a default policy ("remember this
choice" checkbox) to always/never allow the app to send SMS to
premium short codes in the future. The policy can be changed by
the Settings app in the app info screen.
Bug:
5513975
Change-Id: I93053fef1524ee7772cc87364c760cb3dbf01ad7
rich cannings [Fri, 14 Sep 2012 23:06:14 +0000 (16:06 -0700)]
am
b2f4efb7: Correct strings for Plaform Anti-malware
* commit '
b2f4efb7a8bacabecaa886cb6b561019630871d9':
Correct strings for Plaform Anti-malware
rich cannings [Fri, 14 Sep 2012 21:35:18 +0000 (14:35 -0700)]
Correct strings for Plaform Anti-malware
Set strings to:
Verify apps
Disallow or warn before installation of apps that may cause harm
Bug:
7168682
Change-Id: Ic0102dd82ec26dd7239eaeaa7daa2b2f47fd6365
Michael Jurka [Fri, 14 Sep 2012 21:13:58 +0000 (14:13 -0700)]
am
bc7f678c: Merge "Fix crash in Settings > Security" into jb-mr1-dev
* commit '
bc7f678cc9334ef9d45a220fd0ef2db9c31019dc':
Fix crash in Settings > Security
Michael Jurka [Fri, 14 Sep 2012 21:12:14 +0000 (14:12 -0700)]
Merge "Fix crash in Settings > Security" into jb-mr1-dev
Michael Jurka [Fri, 14 Sep 2012 21:09:16 +0000 (14:09 -0700)]
Fix crash in Settings > Security
Change-Id: Ib439c652f4f8a55cac710dbd22792943a7ef8f98
Amith Yamasani [Fri, 14 Sep 2012 20:08:37 +0000 (13:08 -0700)]
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
Amith Yamasani [Fri, 14 Sep 2012 20:07:11 +0000 (13:07 -0700)]
Merge "Watch for profile changes and push to user manager" into jb-mr1-dev
Jeff Sharkey [Fri, 14 Sep 2012 20:05:04 +0000 (13:05 -0700)]
am
3a932f33: Merge "Treat cache storage usage as available space." into jb-mr1-dev
* commit '
3a932f33223e54d619014afa3e34799bc6256b69':
Treat cache storage usage as available space.
Jeff Sharkey [Fri, 14 Sep 2012 20:03:27 +0000 (13:03 -0700)]
Merge "Treat cache storage usage as available space." into jb-mr1-dev
Jeff Sharkey [Fri, 14 Sep 2012 20:01:17 +0000 (13:01 -0700)]
Treat cache storage usage as available space.
Bug:
7123160
Change-Id: I1b3f36622be557d7c47f1452832f67da40893a02
Michael Jurka [Fri, 14 Sep 2012 19:47:01 +0000 (12:47 -0700)]
am
8227e303: Add support for setting lock widgets
* commit '
8227e303850d7c1162c62947b70d0592432b455e':
Add support for setting lock widgets
Michael Jurka [Fri, 7 Sep 2012 16:24:03 +0000 (09:24 -0700)]
Add support for setting lock widgets
Change-Id: I26165f1bc60e3cf277dbdd4f627ac720b492ffde
Michael Jurka [Fri, 14 Sep 2012 19:21:49 +0000 (12:21 -0700)]
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
Michael Jurka [Fri, 14 Sep 2012 19:19:39 +0000 (12:19 -0700)]
Merge "Adding ability to filter for certain types of widgets in picker activity" into jb-mr1-dev
Robert Greenwalt [Fri, 14 Sep 2012 17:55:54 +0000 (10:55 -0700)]
am
9310f85d: Merge "Protect self from async change of BluetoothPan" into jb-mr1-dev
* commit '
9310f85dc7f5421f9ca6b1d644c8ddff792e8f37':
Protect self from async change of BluetoothPan
Robert Greenwalt [Fri, 14 Sep 2012 17:53:54 +0000 (10:53 -0700)]
Merge "Protect self from async change of BluetoothPan" into jb-mr1-dev
Robert Greenwalt [Thu, 13 Sep 2012 22:02:00 +0000 (15:02 -0700)]
Protect self from async change of BluetoothPan
bug:
6945678
Change-Id: I627a55aea9170f889823a38c8e2bb08a06faa841
Amith Yamasani [Fri, 14 Sep 2012 01:06:49 +0000 (18:06 -0700)]
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
Dianne Hackborn [Thu, 13 Sep 2012 17:37:45 +0000 (10:37 -0700)]
am
b6d7c9c6: Merge "Multi-user battery settings." into jb-mr1-dev
* commit '
b6d7c9c6f93e3d50a3fc5ce2db900a10cbb258e4':
Multi-user battery settings.
Dianne Hackborn [Thu, 13 Sep 2012 17:36:13 +0000 (10:36 -0700)]
Merge "Multi-user battery settings." into jb-mr1-dev
Jeff Sharkey [Thu, 13 Sep 2012 08:32:58 +0000 (01:32 -0700)]
am
4a095381: Merge "Iteration on multi-user Storage UI." into jb-mr1-dev
* commit '
4a0953818da25e2240d32136821d4ecb97f90ce1':
Iteration on multi-user Storage UI.
Jeff Sharkey [Thu, 13 Sep 2012 08:31:46 +0000 (01:31 -0700)]
Merge "Iteration on multi-user Storage UI." into jb-mr1-dev
Jeff Sharkey [Thu, 13 Sep 2012 01:41:25 +0000 (18:41 -0700)]
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
Dianne Hackborn [Thu, 13 Sep 2012 00:02:23 +0000 (17:02 -0700)]
Multi-user battery settings.
Aggregates battery use from other users into one line item.
Change-Id: I811e681891a9ff098491de1e096232f38bf061a9
Christopher Tate [Wed, 12 Sep 2012 22:56:04 +0000 (15:56 -0700)]
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
Amith Yamasani [Wed, 12 Sep 2012 22:56:03 +0000 (15:56 -0700)]
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
Christopher Tate [Wed, 12 Sep 2012 22:41:41 +0000 (15:41 -0700)]
Merge "Don't crash during setup of secondary users" into jb-mr1-dev
Amith Yamasani [Wed, 12 Sep 2012 00:04:10 +0000 (17:04 -0700)]
Tell contacts to return back to Settings when done editing the profile info
Change-Id: I643884af6c062788123b59a115ce6e398430e6b1
Christopher Tate [Wed, 12 Sep 2012 21:32:46 +0000 (14:32 -0700)]
am
4a596b19: Merge "Correct settings namespace for auto time/tz" into jb-mr1-dev
* commit '
4a596b19eb84d9c0fa76aeac863dd5271993d9ce':
Correct settings namespace for auto time/tz
Christopher Tate [Wed, 12 Sep 2012 21:30:35 +0000 (14:30 -0700)]
Merge "Correct settings namespace for auto time/tz" into jb-mr1-dev
Christopher Tate [Wed, 12 Sep 2012 21:27:43 +0000 (14:27 -0700)]
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
Christopher Tate [Wed, 12 Sep 2012 21:25:46 +0000 (14:25 -0700)]
Correct settings namespace for auto time/tz
Bug
7148283
Change-Id: If585b16f5b6ea3046e64eb9c8355fa3c9fbeeada
Fabrice Di Meglio [Wed, 12 Sep 2012 20:28:17 +0000 (13:28 -0700)]
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)
Fabrice Di Meglio [Wed, 12 Sep 2012 20:26:22 +0000 (13:26 -0700)]
Merge "Fix bug #
7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev
Jeff Sharkey [Wed, 12 Sep 2012 06:38:35 +0000 (23:38 -0700)]
am
fc76a78c: Include user identifier in external storage paths.
* commit '
fc76a78c458ac90d7e050ffc233cf9e32a2d9c0b':
Include user identifier in external storage paths.
Jeff Sharkey [Tue, 11 Sep 2012 22:45:19 +0000 (15:45 -0700)]
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
Adam Cohen [Wed, 12 Sep 2012 01:41:01 +0000 (18:41 -0700)]
Adding ability to filter for certain types of widgets in picker activity
Change-Id: I92d8748b62ef017b6cd36ff377958c09c9f097c9
Fabrice Di Meglio [Wed, 12 Sep 2012 01:01:38 +0000 (18:01 -0700)]
Fix bug #
7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
- fix Data Usage text direction for list items
Change-Id: I938fa77e7cfb2a900daa9f5d081c8e2fd63a42cf
Fabrice Di Meglio [Wed, 12 Sep 2012 00:15:19 +0000 (17:15 -0700)]
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)
Fabrice Di Meglio [Wed, 12 Sep 2012 00:13:53 +0000 (17:13 -0700)]
Merge "Fix bug #
7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev
Fabrice Di Meglio [Tue, 11 Sep 2012 22:17:40 +0000 (15:17 -0700)]
Fix bug #
7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
- fix "Network SSID" string direction
Change-Id: I8491f8f9d52f80863ee78b645e2e34f5f5ff3656
Christopher Tate [Tue, 11 Sep 2012 22:01:32 +0000 (15:01 -0700)]
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
Christopher Tate [Tue, 11 Sep 2012 21:59:59 +0000 (14:59 -0700)]
Merge "Wifi settings are in a different namespace now" into jb-mr1-dev
Christopher Tate [Tue, 11 Sep 2012 21:53:25 +0000 (14:53 -0700)]
Wifi settings are in a different namespace now
Bug
7144874
Change-Id: I9d004f7e9d33c821fb64cf789036b6b4e0a23a8e
Martijn Coenen [Tue, 11 Sep 2012 21:46:14 +0000 (14:46 -0700)]
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
...
Martijn Coenen [Tue, 11 Sep 2012 21:43:57 +0000 (14:43 -0700)]
Merge "Fix on/off switch for Android Beam." into jb-mr1-dev
Martijn Coenen [Tue, 11 Sep 2012 21:32:30 +0000 (14:32 -0700)]
Fix on/off switch for Android Beam.
Bug:
7121720
Change-Id: Iec0f9ccfd439d11cfcc13afb45974ce1fd8778f0
Amith Yamasani [Tue, 11 Sep 2012 18:11:28 +0000 (11:11 -0700)]
am
6be075d6: Check the user limit before showing an ADD menu item
* commit '
6be075d6c3de7a9fd28942e9e15f4790d0e73ca3':
Check the user limit before showing an ADD menu item
Amith Yamasani [Tue, 11 Sep 2012 18:01:35 +0000 (11:01 -0700)]
Check the user limit before showing an ADD menu item
Change-Id: I0c5cffa149bfbf6824273b7180db55e1fe313021
Elliott Hughes [Tue, 11 Sep 2012 02:08:34 +0000 (19:08 -0700)]
am
ebca7f3e: am
6aeed784: am
f587f5a5: am
78f5c4d5: am
76ddf411: Merge "Fix /proc/version parsing in Settings."
* commit '
ebca7f3e8e54391e33a5fa656cb96a0dfb2d3732':
Fix /proc/version parsing in Settings.
Elliott Hughes [Tue, 11 Sep 2012 02:07:26 +0000 (19:07 -0700)]
am
6aeed784: am
f587f5a5: am
78f5c4d5: am
76ddf411: Merge "Fix /proc/version parsing in Settings."
* commit '
6aeed7846c5f428c56268d92b437679d683fed4a':
Fix /proc/version parsing in Settings.
Elliott Hughes [Tue, 11 Sep 2012 02:07:16 +0000 (19:07 -0700)]
am
6aeed784: am
f587f5a5: am
78f5c4d5: am
76ddf411: Merge "Fix /proc/version parsing in Settings."
* commit '
6aeed7846c5f428c56268d92b437679d683fed4a':
Fix /proc/version parsing in Settings.
Elliott Hughes [Tue, 11 Sep 2012 02:05:37 +0000 (19:05 -0700)]
am
f587f5a5: am
78f5c4d5: am
76ddf411: Merge "Fix /proc/version parsing in Settings."
* commit '
f587f5a54d4717c8f147ce46979f65f9301cd81d':
Fix /proc/version parsing in Settings.
Elliott Hughes [Tue, 11 Sep 2012 02:03:46 +0000 (19:03 -0700)]
am
78f5c4d5: am
76ddf411: Merge "Fix /proc/version parsing in Settings."
* commit '
78f5c4d5372e38b5a5d1e2f3e3b732951a76f007':
Fix /proc/version parsing in Settings.
Elliott Hughes [Tue, 11 Sep 2012 02:02:47 +0000 (19:02 -0700)]
am
76ddf411: Merge "Fix /proc/version parsing in Settings."
* commit '
76ddf4113ab73acfd3d6172a8965bffec2e7c60f':
Fix /proc/version parsing in Settings.
Michael Jurka [Tue, 11 Sep 2012 01:27:29 +0000 (18:27 -0700)]
am
43a5c62c: am
a47a3c8d: Merge "Fix color of text in widget picker" into jb-mr1-dev
* commit '
43a5c62ceb856dbc4ace1f85dfed276216217c8b':
Fix color of text in widget picker
Michael Jurka [Tue, 11 Sep 2012 01:24:56 +0000 (18:24 -0700)]
am
a47a3c8d: Merge "Fix color of text in widget picker" into jb-mr1-dev
* commit '
a47a3c8dea5212f95167b48be9a5f2af3d819c3a':
Fix color of text in widget picker
Michael Jurka [Tue, 11 Sep 2012 01:24:46 +0000 (18:24 -0700)]
am
a47a3c8d: Merge "Fix color of text in widget picker" into jb-mr1-dev
* commit '
a47a3c8dea5212f95167b48be9a5f2af3d819c3a':
Fix color of text in widget picker
Amith Yamasani [Tue, 11 Sep 2012 01:23:05 +0000 (18:23 -0700)]
am
4e201cc6: am
f7d76210: Merge "User management UI: take 2" into jb-mr1-dev
* commit '
4e201cc6eae8a03e7a8133f32eec9ef0ff4dd7d0':
User management UI: take 2
Michael Jurka [Tue, 11 Sep 2012 01:22:10 +0000 (18:22 -0700)]
Merge "Fix color of text in widget picker" into jb-mr1-dev
Amith Yamasani [Tue, 11 Sep 2012 01:20:35 +0000 (18:20 -0700)]
am
f7d76210: Merge "User management UI: take 2" into jb-mr1-dev
* commit '
f7d7621022e97b516ce9d3a9c72de1780d43e556':
User management UI: take 2
Amith Yamasani [Tue, 11 Sep 2012 01:20:23 +0000 (18:20 -0700)]
am
f7d76210: Merge "User management UI: take 2" into jb-mr1-dev
* commit '
f7d7621022e97b516ce9d3a9c72de1780d43e556':
User management UI: take 2
Amith Yamasani [Tue, 11 Sep 2012 01:18:06 +0000 (18:18 -0700)]
Merge "User management UI: take 2" into jb-mr1-dev
Amith Yamasani [Fri, 7 Sep 2012 01:04:06 +0000 (18:04 -0700)]
User management UI: take 2
Single screen user management, also visible on secondary users.
Work in progress, especially with respect to synchronizing with
the Me profile.
Change-Id: Id6e94a85d53356847e4e019c52e3388de9ecb354
Michael Jurka [Tue, 11 Sep 2012 01:13:19 +0000 (18:13 -0700)]
Fix color of text in widget picker
Elliott Hughes [Tue, 11 Sep 2012 01:02:38 +0000 (18:02 -0700)]
Merge "Fix /proc/version parsing in Settings."
Elliott Hughes [Thu, 6 Sep 2012 21:12:31 +0000 (14:12 -0700)]
Fix /proc/version parsing in Settings.
Change-Id: I4bde0e4935eaa4c27067062443a051976daa115d
Christopher Tate [Tue, 11 Sep 2012 00:25:15 +0000 (17:25 -0700)]
am
3c76c467: am
6a5929b0: Update Settings app to use new namespace for airplane-mode settings
* commit '
3c76c467632194bc8bd4b8b69273ca4b5edf312d':
Update Settings app to use new namespace for airplane-mode settings
Christopher Tate [Tue, 11 Sep 2012 00:18:45 +0000 (17:18 -0700)]
am
6a5929b0: Update Settings app to use new namespace for airplane-mode settings
* commit '
6a5929b086a61a955a4a2f43f5fa251e8754ff4a':
Update Settings app to use new namespace for airplane-mode settings
Christopher Tate [Tue, 11 Sep 2012 00:18:33 +0000 (17:18 -0700)]
am
6a5929b0: Update Settings app to use new namespace for airplane-mode settings
* commit '
6a5929b086a61a955a4a2f43f5fa251e8754ff4a':
Update Settings app to use new namespace for airplane-mode settings
Baligh Uddin [Tue, 11 Sep 2012 00:16:02 +0000 (17:16 -0700)]
am
8f113624: (-s ours) am
955f3477: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '
8f1136241df1544df54e653b007ca96da98ebae6':
Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 11 Sep 2012 00:15:46 +0000 (17:15 -0700)]
am
dd3f01af: (-s ours) am
6ac5ace7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
dd3f01afc3836b9955273f75a5d5fb63798be77f':
Import translations. DO NOT MERGE
John Spurlock [Tue, 11 Sep 2012 00:15:36 +0000 (17:15 -0700)]
am
e42e895d: am
f217f18d: Merge "Dream Settings: Disable settings icon if not selected." into jb-mr1-dev
* commit '
e42e895d9cedc83b5a2c4a86e20e6a34613f3332':
Dream Settings: Disable settings icon if not selected.
Matthew Xie [Tue, 11 Sep 2012 00:15:25 +0000 (17:15 -0700)]
am
206f87c5: am
cce52bd3: Merge "Fix NPE in bluetooth Permission Activity" into jb-mr1-dev
* commit '
206f87c5b99c5653b83ba55682ab4dd622fbfe6c':
Fix NPE in bluetooth Permission Activity
Matthew Xie [Tue, 11 Sep 2012 00:15:12 +0000 (17:15 -0700)]
am
5b0e875d: am
de101033: Merge "Fixed the display count of connected panu device." into jb-mr1-dev
* commit '
5b0e875d2d50d5a805028f495262fcbab9773c11':
Fixed the display count of connected panu device.
rich cannings [Tue, 11 Sep 2012 00:11:56 +0000 (17:11 -0700)]
am
32cf21c9: am
bfbdceff: Grey out App Check setting when no verifiers exist
* commit '
32cf21c9b9000238d69870cada23d45233d11670':
Grey out App Check setting when no verifiers exist
rich cannings [Tue, 11 Sep 2012 00:10:34 +0000 (17:10 -0700)]
am
e6195a12: am
1352c142: Merge "Add package verification to settings app" into jb-mr1-dev
* commit '
e6195a12edac8e32c9176771b36b64915498706d':
Add package verification to settings app
Jeff Brown [Tue, 11 Sep 2012 00:10:15 +0000 (17:10 -0700)]
am
b35bdfe9: am
eda43176: Enable auto-brightness adjustment feature with system prop.
* commit '
b35bdfe9540b2e296fad57820d2b9ad7504532f9':
Enable auto-brightness adjustment feature with system prop.
Svetoslav Ganov [Tue, 11 Sep 2012 00:08:44 +0000 (17:08 -0700)]
am
54ae7e51: am
d4b711e6: Merge "Settings for the screen magnification feature." into jb-mr1-dev
* commit '
54ae7e51a8a675e4ab4d671e19099f74502aba81':
Settings for the screen magnification feature.
Christopher Tate [Tue, 11 Sep 2012 00:06:45 +0000 (17:06 -0700)]
am
7b251126: am
6c084141: Merge "Update Settings app to manipulate now-global settings properly" into jb-mr1-dev
* commit '
7b2511260f3782d656e8712cf69edd9bf88a150b':
Update Settings app to manipulate now-global settings properly
Jeff Sharkey [Tue, 11 Sep 2012 00:06:09 +0000 (17:06 -0700)]
am
20ec00d3: am
04df8b77: Iteration on multi-user storage UI.
* commit '
20ec00d3e8681f57cdfe465a907c3fc705b05772':
Iteration on multi-user storage UI.
Christopher Tate [Mon, 10 Sep 2012 22:39:05 +0000 (15:39 -0700)]
Update Settings app to use new namespace for airplane-mode settings
Bug
7132230
Change-Id: I0253637e6d464afc229cf11ffe69852bf44fe261
Baligh Uddin [Mon, 10 Sep 2012 21:29:41 +0000 (14:29 -0700)]
Revert "Import translations. DO NOT MERGE"
Broken Build.
This reverts commit
e88b7faf434ef1ddecf341e6c3470bc055610bb7
Change-Id: I6860b5d4694e8f6338c190f14c6e615a45030076
Baligh Uddin [Mon, 10 Sep 2012 21:27:03 +0000 (14:27 -0700)]
am
955f3477: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '
955f3477a910f56132f341f6679c9157b0cd515c':
Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 10 Sep 2012 21:26:59 +0000 (14:26 -0700)]
am
955f3477: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '
955f3477a910f56132f341f6679c9157b0cd515c':
Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 10 Sep 2012 21:24:57 +0000 (14:24 -0700)]
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
Baligh Uddin [Mon, 10 Sep 2012 21:24:29 +0000 (14:24 -0700)]
Revert "Import translations. DO NOT MERGE"
Broken build.
This reverts commit
d5babab623512cb7c9d27ee10af2702272c64aa6
Change-Id: Ia088b9bb3471c943276a435bd5c749c45125a19d
OSDN Git Service
