Jeff Sharkey
ff571fee86
Merge "Hide lockdown VPN when IMS auth is required." into jb-mr1-dev
2012-09-24 13:08:56 -07:00
Chris Wren
2bc32ae808
move remaining dock settings into sound settings fragment.
...
Bug: 7016769
Change-Id: I21a7bf6140f7470dbb9bebeda1ebcc3f17c481c6
2012-09-24 15:57:10 -04:00
Jeff Sharkey
07d465ddb8
Hide lockdown VPN when IMS auth is required.
...
Bug: 7069782
Change-Id: I978d89894da17164a1e0122adb5acbfda3586fa1
2012-09-24 12:56:29 -07:00
Adam Cohen
6f2f479c5c
am c939735b
: Merge "Addressing issue where power control widget disappears issue 7205586" into jb-mr1-dev
...
* commit 'c939735b176a3a401e8a3e60e9fd8a6a732a2dc0':
Addressing issue where power control widget disappears issue 7205586
2012-09-24 11:51:19 -07:00
Adam Cohen
c939735b17
Merge "Addressing issue where power control widget disappears issue 7205586" into jb-mr1-dev
2012-09-24 11:49:24 -07:00
The Android Open Source Project
dde890a6d3
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I736712a26a0e9991d500f7f654eb12dbbd511db4
2012-09-24 10:13:39 -07:00
Amith Yamasani
16a6fd4bb4
am 7fb91855
: Merge "Show more settings and add restrictions/dialogs for secondary users" into jb-mr1-dev
...
* commit '7fb91855b05b312e45bfded72d48e0cffcee4a44':
Show more settings and add restrictions/dialogs for secondary users
2012-09-24 09:26:01 -07:00
Jeff Sharkey
c912f5c6ab
am 0e9cf8a7
: Storage item to represent cached data.
...
* commit '0e9cf8a723c3e03207e905e8e03303ec4b5526dc':
Storage item to represent cached data.
2012-09-24 09:26:00 -07:00
Baligh Uddin
fb6cea755c
am b1055311
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'b105531116148d5d29e113e611ac180aa9691c6e':
Import translations. DO NOT MERGE
2012-09-24 09:25:58 -07:00
Baligh Uddin
dea83bdd13
am 17b7a8cd
: Merge "Remove no longer used dream_settings.xml." into jb-mr1-dev
...
* commit '17b7a8cd1895871441c86afef5387acfa3b81b57':
Remove no longer used dream_settings.xml.
2012-09-24 09:25:57 -07:00
Romain Guy
4be0fe59d9
am 70edd393
: Merge "Add new developer setting to visualize overdraw" into jb-mr1-dev
...
* commit '70edd393bf6590647c12808e20efa928eba96705':
Add new developer setting to visualize overdraw
2012-09-24 09:25:56 -07:00
Svetoslav Ganov
dd381701db
am f85e7e15
: Merge "Accessibility multi-user support." into jb-mr1-dev
...
* commit 'f85e7e15a75d5a475e10940e1b3d570210729b64':
Accessibility multi-user support.
2012-09-24 09:25:55 -07:00
The Android Automerger
ca88cda071
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-24 06:59:22 -07:00
The Android Automerger
b44bdb2f59
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-23 19:00:18 -07:00
Amith Yamasani
7fb91855b0
Merge "Show more settings and add restrictions/dialogs for secondary users" into jb-mr1-dev
2012-09-23 18:47:20 -07:00
Amith Yamasani
9627a8ea15
Show more settings and add restrictions/dialogs for secondary users
...
Bug: 7213029 crash in About>Status
Bug: 7212495 hide System updates for second user
Bug: 7212230 nickname editor should select the text
Bug: 7160487 TTS settings
Bug: 7129411 Settings needs visibility changes for secondary users
Change-Id: Ia2d1229c08b392edfa6b671fce4a382410405b14
2012-09-23 18:43:31 -07:00
Jeff Sharkey
0e9cf8a723
Storage item to represent cached data.
...
When touched, offers to clear all cached data.
Bug: 7216370
Change-Id: I86afe66b819fb7deeba909bef507925fc5a590f3
2012-09-23 17:49:31 -07:00
Baligh Uddin
b105531116
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-23 08:14:05 -07:00
Baligh Uddin
17b7a8cd18
Merge "Remove no longer used dream_settings.xml." into jb-mr1-dev
2012-09-23 08:13:38 -07:00
Baligh Uddin
9307c8e9f9
Import translations. DO NOT MERGE
...
Change-Id: Ie4f6419929f793550859314eb624135452f845f4
Auto-generated-cl: translation import
2012-09-22 14:20:39 -07:00
The Android Automerger
8deb86f7c9
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-22 09:42:44 -07:00
John Spurlock
1ce93065a5
Remove no longer used dream_settings.xml.
...
Change-Id: I8355372f4dd2f99a92b4a708cf38276c5e7f41d4
2012-09-22 10:38:43 -04:00
Romain Guy
70edd393bf
Merge "Add new developer setting to visualize overdraw" into jb-mr1-dev
2012-09-21 19:28:12 -07:00
Romain Guy
098f493dba
Add new developer setting to visualize overdraw
...
Change-Id: I16d6bb5a199233efebf5c3211dbe57dc9b6729c9
2012-09-21 19:23:20 -07:00
Adam Cohen
2078b6916d
Addressing issue where power control widget disappears issue 7205586
...
Change-Id: I6eea146d3819d3b35f1420e59d4ebdbc66041a9e
2012-09-21 18:52:24 -07:00
Svetoslav Ganov
f85e7e15a7
Merge "Accessibility multi-user support." into jb-mr1-dev
2012-09-21 17:41:31 -07:00
Svetoslav Ganov
46045d8b12
Accessibility multi-user support.
...
1. Accessibility settings are now shown for every user.
bug:6967373
Change-Id: Ie31a6a573031bde1d769e43c4d5d88b7e4c8525d
2012-09-21 17:25:46 -07:00
Svetoslav Ganov
1bd69f9aba
am 0a48c169
: Merge "Remove accessibility category from developer options." into jb-mr1-dev
...
* commit '0a48c1690bd0aa7901e8fc737ca9e4dadec22ea4':
Remove accessibility category from developer options.
2012-09-21 17:15:42 -07:00
Svetoslav Ganov
0a48c1690b
Merge "Remove accessibility category from developer options." into jb-mr1-dev
2012-09-21 17:12:08 -07:00
Dianne Hackborn
3fea212396
am f4bd1a70
: Merge "Fix issue 7198767, 7198366, 7189824." into jb-mr1-dev
...
* commit 'f4bd1a705f6b4e1e575c46f88ca91c02144e551e':
Fix issue 7198767, 7198366, 7189824.
2012-09-21 17:07:09 -07:00
Dianne Hackborn
f4bd1a705f
Merge "Fix issue 7198767, 7198366, 7189824." into jb-mr1-dev
2012-09-21 17:05:23 -07:00
Dianne Hackborn
c715fb1207
Fix issue 7198767, 7198366, 7189824.
...
Bug #7198767 : Crash on choosing App info from the Recent apps tab
Bug #7198366 : Settings UI should not show other Users' apps
Bug #7189824 : Settings crashes on trying to access Battery usage summary
Also fix running services to be able to show user bitmap when in
secondary users, crash in running services if a service is running
whose app is not installed for the current user.
Change-Id: Ief24810c9ddce1ec3f8641ce08af79e1bc18f221
2012-09-21 17:02:22 -07:00
Baligh Uddin
e6bb67f811
am 936186c6
: Revert "Import translations. DO NOT MERGE"
...
* commit '936186c614903f79cc562c005801f95863cbe054':
Revert "Import translations. DO NOT MERGE"
2012-09-21 16:37:25 -07:00
Baligh Uddin
936186c614
Revert "Import translations. DO NOT MERGE"
...
Build Broken
This reverts commit 8172ea490f
Change-Id: I091c3300ecce597bb0133f62bc621f29af85e5ba
2012-09-21 16:35:05 -07:00
Baligh Uddin
fb7cb4d3dd
am 8172ea49
: Import translations. DO NOT MERGE
...
* commit '8172ea490f5880b1e2df2856364c3d37c28ed155':
Import translations. DO NOT MERGE
2012-09-21 16:13:01 -07:00
Baligh Uddin
8172ea490f
Import translations. DO NOT MERGE
...
Change-Id: Iae4b42c08cd2e16f700c844579fcb9b1664a2960
Auto-generated-cl: translation import
2012-09-21 15:48:35 -07:00
The Android Automerger
7653179b99
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-21 07:00:23 -07:00
Michael Jurka
cbf5be09b0
am 406b01f4
: Merge "Add support for changing status widget on security screen" into jb-mr1-dev
...
* commit '406b01f4ffe61f21a7fbaadac3e2a37a58eb2e2e':
Add support for changing status widget on security screen
2012-09-21 01:13:11 -07:00
Michael Jurka
406b01f4ff
Merge "Add support for changing status widget on security screen" into jb-mr1-dev
2012-09-21 01:11:00 -07:00
Michael Jurka
091477b4de
Add support for changing status widget on security screen
...
Change-Id: I68a8ce2ce03888a8decbe017d67634c6965f0a1a
2012-09-21 01:01:39 -07:00
Amith Yamasani
10e59b1c6e
am e4f249bb
: Merge "Exclude dying users when querying the list" into jb-mr1-dev
...
* commit 'e4f249bb7a9f999633d938d0c519631764bf969c':
Exclude dying users when querying the list
2012-09-20 23:11:00 -07:00
Amith Yamasani
e4f249bb7a
Merge "Exclude dying users when querying the list" into jb-mr1-dev
2012-09-20 23:09:21 -07:00
Amith Yamasani
e278eda851
Exclude dying users when querying the list
...
Bug: 7194894
Use the new API in UserManager to query the list of users, excluding
the dying ones.
Change-Id: Ib09bb723209030da7e8aca53d402ef4c96c273a3
2012-09-20 22:44:48 -07:00
Fabrice Di Meglio
38dd190c98
am 377ab9c2
: Merge "Fix bug #7198585 Settings > Display > Dream completely broken in RTL" into jb-mr1-dev
...
* commit '377ab9c2e42f90976f4af7eb362210fb2c409f7a':
Fix bug #7198585 Settings > Display > Dream completely broken in RTL
2012-09-20 20:22:54 -07:00
Svetoslav Ganov
43af40be48
Remove accessibility category from developer options.
...
1. There is a temporary accessibility option in developer options with
one item for enabling automatic zoom out and panning. This is not a
developer option in general and should not be there.
bug:7207305
Change-Id: Ib146ccb3704dd94d635cc668b71c007fbd8d29b3
2012-09-20 19:15:33 -07:00
Fabrice Di Meglio
377ab9c2e4
Merge "Fix bug #7198585 Settings > Display > Dream completely broken in RTL" into jb-mr1-dev
2012-09-20 16:52:59 -07:00
Fabrice Di Meglio
ecadb07b4c
Fix bug #7198585 Settings > Display > Dream completely broken in RTL
...
- use start/end instead of left/right
- use android:textDirection="locale" on the TextView for forcing the
correct position of the title text
Change-Id: I968798dcd4ac9307ffc3e48369990b73d3d1b4db
2012-09-20 15:30:49 -07:00
The Android Open Source Project
a9ac2a46d1
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I2692af987f16852c90fa0826367700862c6ea23b
2012-09-20 10:37:00 -07:00
The Android Automerger
28cbc338b1
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-20 07:00:29 -07:00
Jeff Brown
cf0c0089c6
am 9e143f5e
: First draft of wifi display settings UI.
...
* commit '9e143f5e9d836d2d3dd0b2f59f7d14327ade0193':
First draft of wifi display settings UI.
2012-09-20 06:09:39 -07:00