Commit Graph

7623 Commits

Author SHA1 Message Date
Christopher Tate
acee16f5ce Wifi settings are in a different namespace now
Bug 7144874

Change-Id: I9d004f7e9d33c821fb64cf789036b6b4e0a23a8e
2012-09-11 14:53:25 -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
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
a47a3c8dea Merge "Fix color of text in widget picker" into jb-mr1-dev 2012-09-10 18:22:11 -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
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
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

Change-Id: Ia088b9bb3471c943276a435bd5c749c45125a19d
2012-09-10 14:24:29 -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
f217f18d5e Merge "Dream Settings: Disable settings icon if not selected." into jb-mr1-dev 2012-09-10 13:35:41 -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
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
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
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
1352c142a3 Merge "Add package verification to settings app" into jb-mr1-dev 2012-09-08 22:17:10 -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
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
Christopher Tate
6c0841412e Merge "Update Settings app to manipulate now-global settings properly" into jb-mr1-dev 2012-09-07 14:37:03 -07:00
Christopher Tate
5a64c739bf Update Settings app to manipulate now-global settings properly
Change-Id: I6c269051c7d2db87f70f44df74e06456588c3b6f
2012-09-07 13:35:31 -07:00
Jeff Sharkey
04df8b77a4 Iteration on multi-user storage UI.
Adds headers to distinguish between current and other users.  Also
correctly orders color chips.

Bug: 7003520
Change-Id: I871f1a38d41dad5a5f7d97d91d2ebaac5951066c
2012-09-07 13:23:55 -07:00
Jeff Sharkey
96c2f8c508 Progress towards split storage categories.
Cleans up StorageVolumePreferenceCategory creation, and uses new
isPrimary() API instead of passing around hacky "i == 0" derived
value.

Bug: 7003520
Change-Id: I9eb7164035b5368ee795e35b22e750aebbf3b159
2012-09-06 23:21:09 -07:00
Elliott Hughes
88220b7204 am 4ad02d02: am a76ba7bb: am cfbc61de: Merge "Stop using getDSTSavings."
* commit '4ad02d02b8a27c627eace2bdf1fe8e0b3cfe08fb':
  Stop using getDSTSavings.
2012-09-06 16:41:16 -07:00
Elliott Hughes
4ad02d02b8 am a76ba7bb: am cfbc61de: Merge "Stop using getDSTSavings."
* commit 'a76ba7bb301e2349541ddeeb492d3bf4f6e6b70c':
  Stop using getDSTSavings.
2012-09-06 16:40:09 -07:00
Elliott Hughes
105d879cce am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master
* commit '98d9380a5c3c6a6bfa5687af993ea43c882226b9':
  Stop hard-coding sample 12- and 24-hour times.
2012-09-06 16:39:41 -07:00
Elliott Hughes
a76ba7bb30 am cfbc61de: Merge "Stop using getDSTSavings."
* commit 'cfbc61de3f94a620153ca83a790e4d1b03a9078e':
  Stop using getDSTSavings.
2012-09-06 16:38:37 -07:00
Elliott Hughes
98d9380a5c am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master
* commit '680c8c8e43804d9bf69568d4748b3bd3a4aea0ee':
  Stop hard-coding sample 12- and 24-hour times.
2012-09-06 16:37:44 -07:00
Elliott Hughes
680c8c8e43 resolved conflicts for merge of 33f86196 to stage-aosp-master
Change-Id: Ifc5a986179d010358a93869d9e8867af8c30f9b8
2012-09-06 16:09:04 -07:00
Elliott Hughes
cfbc61de3f Merge "Stop using getDSTSavings." 2012-09-06 15:50:10 -07:00
Elliott Hughes
6c7f55ee4b Stop using getDSTSavings.
The original code was actually correct, but code calling inDaylightTime
and getDSTSavings directly is inherently suspect, so I want to clean up
this false positive along with the real abusers.

Bug: 6901488
Change-Id: I6c89e7aa29d88b81ed2c7fd6c915e0346b90a442
2012-09-06 15:42:09 -07:00
Elliott Hughes
33f8619677 Merge "Stop hard-coding sample 12- and 24-hour times." 2012-09-06 15:29:47 -07:00
Elliott Hughes
82723df002 Stop hard-coding sample 12- and 24-hour times.
Bug: 6881640
Change-Id: I6b0d6404b0299f9efa8fd12779799f703f1c764f
2012-09-06 14:49:35 -07:00
Baligh Uddin
d4e216bc9e Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev 2012-09-06 11:16:17 -07:00
Baligh Uddin
cbc213e54c Revert "Import translations. DO NOT MERGE"
Broke the build.

This reverts commit 9dcb0727d0

Change-Id: I3a468f51981456476ca9c76086f0a5c08ba6a61b
2012-09-06 11:15:52 -07:00
Baligh Uddin
d2dec8c70e Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-06 10:53:13 -07:00
The Android Open Source Project
710aeba1ce am c53ce268: (-s ours) Reconcile with jb-release - do not merge
* commit 'c53ce26836eccfe9c0bb315d965bc73a9bd7b214':
2012-09-06 08:21:38 -07:00
The Android Open Source Project
c53ce26836 Reconcile with jb-release - do not merge
Change-Id: I34fdfc427ea0fd0dc887303e7c019226a665f4de
2012-09-06 08:09:26 -07:00
Charles Chen
ee04e47216 Merge "Add content descriptions to power control widget." into jb-mr1-dev 2012-09-05 17:13:24 -07:00
Baligh Uddin
9dcb0727d0 Import translations. DO NOT MERGE
Change-Id: If5b1608924c422e97c0a12ff0a41f0ade35b2822
Auto-generated-cl: translation import
2012-09-05 14:02:53 -07:00
John Spurlock
1537e8b3e8 Dream settings: list items back to constant height
Expanding/collapsing items removed, settings icon shown on right
with divider if applicable.

New "Start" action on the action bar to start dreaming.  This is
no longer in preview/test mode, but a call to .dream().

Bug: 7010260
Change-Id: Ia1d8b9a70218dcc598bf62befbf545f572bbc6b1
2012-09-05 10:28:49 -04:00