Romain Guy
9a38e484e7
am 4be0fe59
: am 70edd393
: Merge "Add new developer setting to visualize overdraw" into jb-mr1-dev
...
* commit '4be0fe59d9c9c61acc248464957dcd2e9f18abca':
Add new developer setting to visualize overdraw
2012-09-24 09:33:46 -07:00
Svetoslav Ganov
7253131c04
am dd381701
: am f85e7e15
: Merge "Accessibility multi-user support." into jb-mr1-dev
...
* commit 'dd381701db67697ac8ccd5e2d01aeba2ff92cbcd':
Accessibility multi-user support.
2012-09-24 09:33:44 -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
Amith Yamasani
8d1e4bef6f
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 08:32:09 -07:00
Jeff Sharkey
bbd5d2016b
am 0e9cf8a7
: Storage item to represent cached data.
...
* commit '0e9cf8a723c3e03207e905e8e03303ec4b5526dc':
Storage item to represent cached data.
2012-09-24 08:32:08 -07:00
Baligh Uddin
70906b8efd
am b1055311
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'b105531116148d5d29e113e611ac180aa9691c6e':
Import translations. DO NOT MERGE
2012-09-24 08:32:07 -07:00
Baligh Uddin
06cd95e4d4
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 08:32:06 -07:00
Romain Guy
d92f64652a
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 08:32:05 -07:00
Svetoslav Ganov
e734da88d6
am f85e7e15
: Merge "Accessibility multi-user support." into jb-mr1-dev
...
* commit 'f85e7e15a75d5a475e10940e1b3d570210729b64':
Accessibility multi-user support.
2012-09-24 08:32:03 -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
Svetoslav Ganov
29dd06463a
am 1bd69f9a
: am 0a48c169
: Merge "Remove accessibility category from developer options." into jb-mr1-dev
...
* commit '1bd69f9abab775ec1aceee53153c3a7e5aa329ec':
Remove accessibility category from developer options.
2012-09-24 00:52:10 -07:00
Dianne Hackborn
d592ce2974
am 3fea2123
: am f4bd1a70
: Merge "Fix issue 7198767, 7198366, 7189824." into jb-mr1-dev
...
* commit '3fea2123960fd7d0f2d766f16a8bdb69e570355a':
Fix issue 7198767, 7198366, 7189824.
2012-09-24 00:52:04 -07:00
Baligh Uddin
81cace918c
am e6bb67f8
: (-s ours) am 936186c6
: Revert "Import translations. DO NOT MERGE"
...
* commit 'e6bb67f811eac5dcc93f417a2eade0a6d4905abf':
Revert "Import translations. DO NOT MERGE"
2012-09-24 00:51:49 -07:00
Baligh Uddin
9d43b57610
am fb7cb4d3
: (-s ours) am 8172ea49
: Import translations. DO NOT MERGE
...
* commit 'fb7cb4d3ddeb6d4250cd4d02d05a705030b0dc21':
Import translations. DO NOT MERGE
2012-09-24 00:51:22 -07:00
Lei Zhang
97679dc270
Fix build. Revert "Import translations. DO NOT MERGE"
...
This reverts commit b5153f6d83
Change-Id: I5f6803c413c1037d5ef90ff15949d5da9cfc43cb
2012-09-24 00:09:04 -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
53090255c2
Import translations. DO NOT MERGE
...
Change-Id: I24f5f103806bd5012567cf50060af86aa1fc53c6
Auto-generated-cl: translation import
2012-09-22 14:22:58 -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
Baligh Uddin
b5153f6d83
Import translations. DO NOT MERGE
...
Change-Id: I892cd85a6f079880ab8e9431950a1e24bdfe138f
Auto-generated-cl: translation import
2012-09-22 14:19:04 -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
Baligh Uddin
1bd920a42c
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev
2012-09-21 21:26:27 -07:00
Baligh Uddin
bc419e5b36
Revert "Import translations. DO NOT MERGE"
...
Broken Build
This reverts commit 318b49c504
Change-Id: I7ec637e1b55b5ad619c574a71c924461dd730ccf
2012-09-21 21:25:59 -07: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
7503149010
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:50:39 -07:00
Dianne Hackborn
07a7367d84
am f4bd1a70
: Merge "Fix issue 7198767, 7198366, 7189824." into jb-mr1-dev
...
* commit 'f4bd1a705f6b4e1e575c46f88ca91c02144e551e':
Fix issue 7198767, 7198366, 7189824.
2012-09-21 17:50:33 -07:00
Baligh Uddin
c1f19dbca3
am 936186c6
: (-s ours) Revert "Import translations. DO NOT MERGE"
...
* commit '936186c614903f79cc562c005801f95863cbe054':
Revert "Import translations. DO NOT MERGE"
2012-09-21 17:50:19 -07:00
Baligh Uddin
b03a649efa
am 8172ea49
: (-s ours) Import translations. DO NOT MERGE
...
* commit '8172ea490f5880b1e2df2856364c3d37c28ed155':
Import translations. DO NOT MERGE
2012-09-21 17:49:53 -07:00
Michael Jurka
f189d5d989
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 17:45:01 -07:00
Amith Yamasani
9a681567a0
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-21 17:44:47 -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