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
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
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
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
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
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
9be733faa8
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
2012-09-11 15:01:32 -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
de940136ad
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
...
2012-09-11 14:46:14 -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
a93d2e6a28
am 6be075d6
: Check the user limit before showing an ADD menu item
...
* commit '6be075d6c3de7a9fd28942e9e15f4790d0e73ca3':
Check the user limit before showing an ADD menu item
2012-09-11 11:11:28 -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
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
5711c70818
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:26 -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
d7adbbab11
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:56 -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
714ddf4289
am f7d76210
: Merge "User management UI: take 2" into jb-mr1-dev
...
* commit 'f7d7621022e97b516ce9d3a9c72de1780d43e556':
User management UI: take 2
2012-09-10 18:20:35 -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
Elliott Hughes
76ddf4113a
Merge "Fix /proc/version parsing in Settings."
2012-09-10 18:02:38 -07:00
Elliott Hughes
d267d377fb
Fix /proc/version parsing in Settings.
...
Change-Id: I4bde0e4935eaa4c27067062443a051976daa115d
2012-09-10 17:58:15 -07:00
Christopher Tate
26fb99de74
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
2012-09-10 17:25:15 -07:00
Christopher Tate
4bde617aed
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
2012-09-10 17:18:45 -07:00
Christopher Tate
3c76c46763
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
2012-09-10 17:18:33 -07:00
Baligh Uddin
ea7a7d4366
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"
2012-09-10 17:16:02 -07:00
Baligh Uddin
ddb4389170
am dd3f01af
: (-s ours) am 6ac5ace7
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'dd3f01afc3836b9955273f75a5d5fb63798be77f':
Import translations. DO NOT MERGE
2012-09-10 17:15:46 -07:00
John Spurlock
140c82a605
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.
2012-09-10 17:15:36 -07:00
Matthew Xie
be82dab9d5
am 206f87c5
: am cce52bd3
: Merge "Fix NPE in bluetooth Permission Activity" into jb-mr1-dev
...
* commit '206f87c5b99c5653b83ba55682ab4dd622fbfe6c':
Fix NPE in bluetooth Permission Activity
2012-09-10 17:15:25 -07:00
Matthew Xie
d1481db71c
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.
2012-09-10 17:15:12 -07:00
rich cannings
d35bec073c
am 32cf21c9
: am bfbdceff
: Grey out App Check setting when no verifiers exist
...
* commit '32cf21c9b9000238d69870cada23d45233d11670':
Grey out App Check setting when no verifiers exist
2012-09-10 17:11:56 -07:00
rich cannings
88da72e0bd
am e6195a12
: am 1352c142
: Merge "Add package verification to settings app" into jb-mr1-dev
...
* commit 'e6195a12edac8e32c9176771b36b64915498706d':
Add package verification to settings app
2012-09-10 17:10:34 -07:00
Jeff Brown
ec2f4f5a6c
am b35bdfe9
: am eda43176
: Enable auto-brightness adjustment feature with system prop.
...
* commit 'b35bdfe9540b2e296fad57820d2b9ad7504532f9':
Enable auto-brightness adjustment feature with system prop.
2012-09-10 17:10:15 -07:00