Michael Jurka
bc7f678cc9
Merge "Fix crash in Settings > Security" into jb-mr1-dev
2012-09-14 14:12:14 -07:00
The Android Automerger
19487f3836
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-14 14:10:50 -07:00
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
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
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
8227e30385
Add support for setting lock widgets
...
Change-Id: I26165f1bc60e3cf277dbdd4f627ac720b492ffde
2012-09-14 12:44:20 -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
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
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
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
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
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
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 Automerger
70d85c4edf
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-12 07:00:19 -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
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
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
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
6be075d6c3
Check the user limit before showing an ADD menu item
...
Change-Id: I0c5cffa149bfbf6824273b7180db55e1fe313021
2012-09-11 11:01:35 -07:00
The Android Automerger
d7c704da6a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-11 07:00:03 -07:00
Elliott Hughes
30b6d23a9e
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.
2012-09-10 19:08:34 -07:00
Elliott Hughes
ebca7f3e8e
am 6aeed784
: am f587f5a5
: am 78f5c4d5
: am 76ddf411
: Merge "Fix /proc/version parsing in Settings."
...
* commit '6aeed7846c5f428c56268d92b437679d683fed4a':
Fix /proc/version parsing in Settings.
2012-09-10 19:07:16 -07:00
Elliott Hughes
6aeed7846c
am f587f5a5
: am 78f5c4d5
: am 76ddf411
: Merge "Fix /proc/version parsing in Settings."
...
* commit 'f587f5a54d4717c8f147ce46979f65f9301cd81d':
Fix /proc/version parsing in Settings.
2012-09-10 19:05:37 -07:00
Elliott Hughes
f587f5a54d
am 78f5c4d5
: am 76ddf411
: Merge "Fix /proc/version parsing in Settings."
...
* commit '78f5c4d5372e38b5a5d1e2f3e3b732951a76f007':
Fix /proc/version parsing in Settings.
2012-09-10 19:03:46 -07:00
Elliott Hughes
78f5c4d537
am 76ddf411
: Merge "Fix /proc/version parsing in Settings."
...
* commit '76ddf4113ab73acfd3d6172a8965bffec2e7c60f':
Fix /proc/version parsing in Settings.
2012-09-10 19:02:47 -07:00
Michael Jurka
152fc0efe7
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
2012-09-10 18:27:29 -07:00
Michael Jurka
43a5c62ceb
am a47a3c8d
: Merge "Fix color of text in widget picker" into jb-mr1-dev
...
* commit 'a47a3c8dea5212f95167b48be9a5f2af3d819c3a':
Fix color of text in widget picker
2012-09-10 18:24:46 -07:00
Amith Yamasani
10b9602dbe
am 4e201cc6
: am f7d76210
: Merge "User management UI: take 2" into jb-mr1-dev
...
* commit '4e201cc6eae8a03e7a8133f32eec9ef0ff4dd7d0':
User management UI: take 2
2012-09-10 18:23:05 -07:00
Michael Jurka
a47a3c8dea
Merge "Fix color of text in widget picker" into jb-mr1-dev
2012-09-10 18:22:11 -07:00
Amith Yamasani
4e201cc6ea
am f7d76210
: Merge "User management UI: take 2" into jb-mr1-dev
...
* commit 'f7d7621022e97b516ce9d3a9c72de1780d43e556':
User management UI: take 2
2012-09-10 18:20:23 -07:00
Amith Yamasani
f7d7621022
Merge "User management UI: take 2" into jb-mr1-dev
2012-09-10 18:18:07 -07:00
Amith Yamasani
dc6bfa6ef5
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
2012-09-10 18:15:19 -07:00
Michael Jurka
284dc0f44b
Fix color of text in widget picker
2012-09-10 18:13:19 -07:00