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
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
Baligh Uddin
e88b7faf43
Import translations. DO NOT MERGE
...
Change-Id: Ibeb05d837712dbbc9c7728faa7f745ad4f37dcc3
Auto-generated-cl: translation import
2012-09-10 12:19:07 -07:00
John Spurlock
0abbc1ede1
Dream Settings: Disable settings icon if not selected.
...
Bug:7129176
Change-Id: I6ceb6b7bd37032197ab3777901156c9424cbc301
2012-09-10 15:17:10 -04:00
Baligh Uddin
d5babab623
Import translations. DO NOT MERGE
...
Change-Id: I86ce438ad7821460d932824b63aa196c77e61f56
Auto-generated-cl: translation import
2012-09-10 12:15:47 -07:00
Matthew Xie
5b0e875d2d
am de101033: Merge "Fixed the display count of connected panu device." into jb-mr1-dev
...
* commit 'de101033025c53ab8f16c31c57c003c757e47cec':
Fixed the display count of connected panu device.
2012-09-10 12:06:51 -07:00
Matthew Xie
de10103302
Merge "Fixed the display count of connected panu device." into jb-mr1-dev
2012-09-10 12:05:20 -07:00
zzy
6665ee3210
Fixed the display count of connected panu device.
...
Root cause: Bluez relies on the count of activated pan network
interfaces to show how many panu devices are connected. But
Bluedroid has only one shared pan network interface for any
number of connected panu devices.
Change-Id: I52e3d6d79e2f1b9f8afab1d70c9ff1eca3ef2349
2012-09-10 11:59:52 -07:00
rich cannings
32cf21c9b9
am bfbdceff: Grey out App Check setting when no verifiers exist
...
* commit 'bfbdceffe60e20a8db91b54cc81cfe49ea0dd96a':
Grey out App Check setting when no verifiers exist
2012-09-09 14:39:32 -07:00
rich cannings
bfbdceffe6
Grey out App Check setting when no verifiers exist
...
Bug: 7082362
Change-Id: I6e8a6032b58145fe6e2918f364ffd92cbb97ed67
2012-09-09 13:42:59 -07:00
rich cannings
e6195a12ed
am 1352c142: Merge "Add package verification to settings app" into jb-mr1-dev
...
* commit '1352c142a33d0c3ad8ed0f58bbc1d6ce7158cb55':
Add package verification to settings app
2012-09-08 22:18:51 -07:00
rich cannings
1352c142a3
Merge "Add package verification to settings app" into jb-mr1-dev
2012-09-08 22:17:10 -07:00
Jeff Brown
b35bdfe954
am eda43176: Enable auto-brightness adjustment feature with system prop.
...
* commit 'eda43176e3f1fd7dcdd481e4e759c62450f96c88':
Enable auto-brightness adjustment feature with system prop.
2012-09-08 15:56:27 -07:00
Jeff Brown
eda43176e3
Enable auto-brightness adjustment feature with system prop.
...
This feature is experimental and disabled by default.
Change-Id: I9c3c77d6d207ceec65e0babc7915db8d439d5da2
2012-09-08 15:12:19 -07:00
rich cannings
d5d60655a9
Add package verification to settings app
...
Adds a dialog/toggle in security settings to turn package verification on and
off.
Bug: 7082362
Change-Id: I9985437ae28e4a999992c91a7e88547495ccbda2
2012-09-07 17:09:11 -07:00
Svetoslav Ganov
54ae7e51a8
am d4b711e6: Merge "Settings for the screen magnification feature." into jb-mr1-dev
...
* commit 'd4b711e60361a2a05ffa11a4199cceea54d3ea96':
Settings for the screen magnification feature.
2012-09-07 16:22:47 -07:00
Svetoslav Ganov
d4b711e603
Merge "Settings for the screen magnification feature." into jb-mr1-dev
2012-09-07 16:20:37 -07:00
Svetoslav Ganov
decf36e6a5
Settings for the screen magnification feature.
...
1. Screen magnification on the device has to he explicitly enabled
by the user before allowing a global gesture related interactions.
The feature toggle setting is in Settings->Accessibility and it
is a separate screen with instructions how to use the feature
and a toggle switch.
2. Added a setting in developer options for toggling the magnification
auto update feature. If this features is on the screen is zoomed
out or rotation or activity start. Also if the feature is enabled
the magnified viewport will scroll to show popped up windows.
bug:5587727
Change-Id: Ic45a21d3a3928e2f5aac034751801f090b261488
2012-09-07 16:07:57 -07:00
