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
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
dbe6f58962
Update Settings app to use new namespace for airplane-mode settings
...
Bug 7132230
Change-Id: I0253637e6d464afc229cf11ffe69852bf44fe261
2012-09-10 17:39:35 -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
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
Svetoslav Ganov
c12373022b
am 54ae7e51: am d4b711e6: Merge "Settings for the screen magnification feature." into jb-mr1-dev
...
* commit '54ae7e51a8a675e4ab4d671e19099f74502aba81':
Settings for the screen magnification feature.
2012-09-10 17:08:44 -07:00
Christopher Tate
4dbaa21163
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
2012-09-10 17:06:45 -07:00
Jeff Sharkey
43c5ceea73
am 20ec00d3: am 04df8b77: Iteration on multi-user storage UI.
...
* commit '20ec00d3e8681f57cdfe465a907c3fc705b05772':
Iteration on multi-user storage UI.
2012-09-10 17:06:09 -07:00
Christopher Tate
6a5929b086
Update Settings app to use new namespace for airplane-mode settings
...
Bug 7132230
Change-Id: I0253637e6d464afc229cf11ffe69852bf44fe261
2012-09-10 15:46:17 -07:00
Baligh Uddin
ec30983d3d
Revert "Import translations. DO NOT MERGE"
...
Broken Build.
This reverts commit e88b7faf43
2012-09-10 14:29:41 -07:00
Baligh Uddin
8f1136241d
am 955f3477: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
...
* commit '955f3477a910f56132f341f6679c9157b0cd515c':
Revert "Import translations. DO NOT MERGE"
2012-09-10 14:26:59 -07:00
Baligh Uddin
955f3477a9
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
2012-09-10 14:24:58 -07:00
Baligh Uddin
301c2187f3
Revert "Import translations. DO NOT MERGE"
...
Broken build.
This reverts commit d5babab623
2012-09-10 14:24:29 -07:00
Baligh Uddin
dd3f01afc3
am 6ac5ace7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '6ac5ace7f04c550b9ce6427762f30eb901d05f1f':
Import translations. DO NOT MERGE
2012-09-10 14:03:49 -07:00
Baligh Uddin
6ac5ace7f0
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-10 14:01:43 -07:00
John Spurlock
e42e895d9c
am f217f18d: Merge "Dream Settings: Disable settings icon if not selected." into jb-mr1-dev
...
* commit 'f217f18d5e806f73ca572db14d8e3373a0027dbd':
Dream Settings: Disable settings icon if not selected.
2012-09-10 13:37:28 -07:00
John Spurlock
f217f18d5e
Merge "Dream Settings: Disable settings icon if not selected." into jb-mr1-dev
2012-09-10 13:35:41 -07:00
Matthew Xie
206f87c5b9
am cce52bd3: Merge "Fix NPE in bluetooth Permission Activity" into jb-mr1-dev
...
* commit 'cce52bd3a5162326493e4374c9ddc4f333351da7':
Fix NPE in bluetooth Permission Activity
2012-09-10 12:55:27 -07:00
Matthew Xie
cce52bd3a5
Merge "Fix NPE in bluetooth Permission Activity" into jb-mr1-dev
2012-09-10 12:53:51 -07:00
Ganesh Ganapathi Batta
40b77fe04b
Fix NPE in bluetooth Permission Activity
...
This fixes a NPE by ensuring that cached device list has
a cached device associated with a given BDA before accessing
the cached device
Bug:5964529
Change-Id: Ib2c3596e6e008c78f9f1137134e421ca710e1217
2012-09-10 12:50:05 -07:00
