Eric Laurent
0c38f78040
Merge "Single volume control when config_useMasterVolume is true"
2013-05-20 19:13:46 +00:00
Baligh Uddin
6ebd40846a
Import translations. DO NOT MERGE
...
Change-Id: Ic02fef38ac538c74b0ae6fc5262ca2729b6b675d
Auto-generated-cl: translation import
2013-05-20 11:38:20 -07:00
Baligh Uddin
d4d7f3ee62
Import translations. DO NOT MERGE
...
Change-Id: I1c9b7f0dca3797c176d4f7ce82e1744d6795e0b8
Auto-generated-cl: translation import
2013-05-17 12:20:17 -07:00
Baligh Uddin
27d5c392ba
Import translations. DO NOT MERGE
...
Change-Id: Idaa8cda2a62a48bfaf80cd2a3c848ab99179dcda
Auto-generated-cl: translation import
2013-05-17 12:17:02 -07:00
Jaewan Kim
31a0a340b3
Single volume control when config_useMasterVolume is true
...
If config_useMasterVolume is true, all streams are considered as the
STREAM_MASTER. Hide all volume sections except a stream because they
are actually the same in this case.
Bug: 8505295
Change-Id: I9822feaad2d43468ceb4c7fdb97da4b677995992
2013-05-17 02:43:12 +09:00
Amith Yamasani
7545cff217
am 813d2383
: am 00dc15d9
: Merge "Add a settings icon to restricted profile config header" into jb-mr2-dev
...
* commit '813d23838b76623faa6b2ceb4ad7458cba0f726f':
Add a settings icon to restricted profile config header
2013-05-14 14:58:12 -07:00
Amith Yamasani
1d4329631d
Add a settings icon to restricted profile config header
...
This is to make it obvious that the header invokes user info settings.
Bug: 8888002
Also fix a minor copy/paste error in contentDesription attribute.
Change-Id: I3a90b0d691df8302fee696d82c5819f43109ae8e
2013-05-13 14:58:56 -07:00
Baligh Uddin
0309f336cc
Import translations. DO NOT MERGE
...
Change-Id: I55826bb6824378babffe07b0a9353a42eb456818
Auto-generated-cl: translation import
2013-05-13 09:46:14 -07:00
Baligh Uddin
0a3cf29344
Import translations. DO NOT MERGE
...
Change-Id: I7bfc101728e9083d730511df65771c9899ab6549
Auto-generated-cl: translation import
2013-05-13 09:42:52 -07:00
Satoshi Kataoka
a8c37bcae3
Tweak a label in the personal dictionary settings
...
Bug: 8897600
Change-Id: I170ee12c06f5d03af355e279d8ac738f68feaad0
2013-05-10 12:13:49 +09:00
Baligh Uddin
b590a5d9dc
Import translations. DO NOT MERGE
...
Change-Id: I5681e12c45cbea55910772e7761dc122bc55ff71
Auto-generated-cl: translation import
2013-05-08 11:07:07 -07:00
Baligh Uddin
2c766ba56c
Import translations. DO NOT MERGE
...
Change-Id: I693437e166d38e6b56a9b568c455daebfde8694d
Auto-generated-cl: translation import
2013-05-08 11:03:17 -07:00
Dianne Hackborn
6e91babeda
Update UI to add new audio app ops.
...
Change-Id: I307d25bdd6bee2e7d7a9df32849ef206abaf2318
2013-05-06 16:13:34 -07:00
Baligh Uddin
3d7f617cbd
Import translations. DO NOT MERGE
...
Change-Id: Id8e754017aac82b1b423b8f3b02f4191d71a58dd
Auto-generated-cl: translation import
2013-05-06 12:02:35 -07:00
Baligh Uddin
c6adece066
Import translations. DO NOT MERGE
...
Change-Id: Ib1986e8c494733193e49c1504a4cc9396649a324
Auto-generated-cl: translation import
2013-05-06 11:59:20 -07:00
Baligh Uddin
1d9e5d8e71
Merge "Import translations. DO NOT MERGE"
2013-05-04 23:11:09 +00:00
Romain Guy
eb90fc56b2
Add new GPU overdraw setting
...
Change-Id: I45404b37df382e51eea42de92535f49f870c98b2
2013-05-03 17:38:38 -07:00
Baligh Uddin
bd20e4766d
Import translations. DO NOT MERGE
...
Change-Id: I706e8606b77d5ec1076c4954911da5aefb6b1805
Auto-generated-cl: translation import
2013-05-03 13:16:25 -07:00
Baligh Uddin
6681e954a8
Import translations. DO NOT MERGE
...
Change-Id: I6905b70a4bfdbab57f787be455fead0a995904a2
Auto-generated-cl: translation import
2013-05-03 13:12:52 -07:00
Baligh Uddin
cbc7319992
Import translations. DO NOT MERGE
...
Change-Id: I124056964f65373288bf0ba1c530b6764b4c0abf
Auto-generated-cl: translation import
2013-05-01 10:47:18 -07:00
Baligh Uddin
6c886cd394
Import translations. DO NOT MERGE
...
Change-Id: I09ddb61e89b8dfee57a2a4e6c3331a0737f1f290
Auto-generated-cl: translation import
2013-05-01 10:43:33 -07:00
Amith Yamasani
ed03edb69b
am 60167266
: am f162efee
: Prompt to set a screen lock when adding a restricted profile
...
* commit '60167266877d59407939a83c475e794e050c1e8a':
Prompt to set a screen lock when adding a restricted profile
2013-04-30 08:54:00 -07:00
Baligh Uddin
272b29449c
Merge "Import translations. DO NOT MERGE"
2013-04-30 15:37:08 +00:00
Baligh Uddin
edb906af36
Import translations. DO NOT MERGE
...
Change-Id: I76329240b2241ff7c949f725efa875425569bc16
Auto-generated-cl: translation import
2013-04-30 00:45:30 -07:00
Baligh Uddin
e3eb601dc2
Import translations. DO NOT MERGE
...
Change-Id: I81f4941adbfc66c70b241062ae75b4740a065a08
Auto-generated-cl: translation import
2013-04-30 00:42:26 -07:00
Satoshi Kataoka
5df3307309
Fix the title of the fragments of the personal dictionary settings
...
Bug: 8600958
Change-Id: I9b8bab21b144385bc2386e7fcb67e1c197f84113
2013-04-30 16:08:00 +09:00
Amith Yamasani
f162efee89
Prompt to set a screen lock when adding a restricted profile
...
Bug: 8735493
If there's no screen lock, prompt to take the user to set a lock.
On return, check if user set the screen lock. If so, add the restricted
profile, otherwise don't add it.
Fix a small layout issue: Bug: 8721209
Change-Id: I2a18fea50a1d810d6a7fa82038b460ca4e03d5a0
2013-04-29 14:10:06 -07:00
Amith Yamasani
5c460bbafe
am b4a0838d
: am b0171715
: Three kinds of owner info - owner, user and profile
...
* commit 'b4a0838d08198fd93be99ce2907b3f9b70f0d7bc':
Three kinds of owner info - owner, user and profile
2013-04-29 12:14:41 -07:00
Amith Yamasani
52351051e6
am 9649c3eb
: am c5b03657
: Merge "Save app toggle state as soon as possible" into jb-mr2-dev
...
* commit '9649c3ebbe08e310bdc42dbfce48b64d7246a202':
Save app toggle state as soon as possible
2013-04-29 12:14:37 -07:00
Svetoslav
5334dbf090
am 7c2a89c9
: am 4b43e21c
: Merge "Scroll if an accessibility setting description does not fit the screen." into jb-mr2-dev
...
* commit '7c2a89c9f5f4c728b552a6ea64b312c2538854e4':
Scroll if an accessibility setting description does not fit the screen.
2013-04-29 11:22:03 -07:00
Amith Yamasani
b017171587
Three kinds of owner info - owner, user and profile
...
Bug: 8736733
Put the summary "Restricted profile" under the user name in app restrictions panel.
Bug: 8736734
Change-Id: I6b724bd10a9246eb57831bffb737a48c01e0c285
2013-04-28 22:13:22 -07:00
Amith Yamasani
c5b036571e
Merge "Save app toggle state as soon as possible" into jb-mr2-dev
2013-04-28 04:58:54 +00:00
Amith Yamasani
7b56d115ba
Save app toggle state as soon as possible
...
Delaying applying the states till onPause() sometimes results in the apps
disappearing slowly as the new user is booting up, causing failed queued up
broadcasts that result in crash dialogs. This happens mainly when the user
switch is initiated via QuickSettings->LockScreen->Switch while the App
restrictions screen is still showing. The onPause() gets called when
SetupWizard actually takes focus, which is quite late, as boot completed
and other events have already been queued.
Apply the initial toggles right away and apply any user changes when primary
is going to background, or onPause(), whichever comes first.
Bug: 8685927
Also ensure that apps with restrictions get a chance to persist their defaults
as soon as they are toggled on. The user may never actually click on the settings
icon for the app (which was the only way they were getting persisted before).
Some new strings for an upcoming change.
Change-Id: I96f453d066a91c6b15eafe9a6ce3f42d98bf5e33
2013-04-26 15:18:33 -07:00
Svetoslav
4b43e21c64
Merge "Scroll if an accessibility setting description does not fit the screen." into jb-mr2-dev
2013-04-26 22:14:47 +00:00
Svetoslav
3b2d307b89
Scroll if an accessibility setting description does not fit the screen.
...
1. Certain accessibility settings are shown on a separate screen with
a toggle switch and a description. Sometimes the description does not
fit the screen. The preference framework is using a list view for
holding the description item. This list view was disabled, thus not
scrolling (done to avoid drawable state change on click). Now the
list view is enabled and the drawable state change on click problem
is solved by setting the selector and divider drawables to a
transparent one.
2. The layout for the list item that shows the feature description had
an unnecessary linear layout.
bug:8632146
Change-Id: Ib81a8513158d5b8d90fa80f57720c8590022ae1a
2013-04-26 12:36:00 -07:00
Baligh Uddin
2053307bc8
Import translations. DO NOT MERGE
...
Change-Id: I4e1ef0256b87fef9461cd8750f9a5446eba9e91b
Auto-generated-cl: translation import
2013-04-26 10:55:51 -07:00
Baligh Uddin
a69b41bb18
Import translations. DO NOT MERGE
...
Change-Id: I902e886b71e60da9c34d682a8b7c4f2453c06375
Auto-generated-cl: translation import
2013-04-26 10:52:46 -07:00
Baligh Uddin
dbb504294b
am 740afcb6
: am f6d483e6
: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '740afcb64bb967bb4eada7f7bb071706378d818a':
Import translations. DO NOT MERGE
2013-04-25 13:50:33 -07:00
Baligh Uddin
86ef1a5d76
Import translations. DO NOT MERGE
...
Change-Id: Iad94d22f497a67893855012a0732678f25f8e50d
Auto-generated-cl: translation import
2013-04-25 12:05:11 -07:00
Amith Yamasani
ddb950f5ec
am 7200ae73
: am 868acab2
: Merge "Rename limited users to restricted profiles" into jb-mr2-dev
...
* commit '7200ae73c784b6c180f44dc4a5da033ae4c3ca2d':
Rename limited users to restricted profiles
2013-04-24 15:01:02 -07:00
Amith Yamasani
868acab2a0
Merge "Rename limited users to restricted profiles" into jb-mr2-dev
2013-04-24 21:54:16 +00:00
Amith Yamasani
8e6f99e22b
Rename limited users to restricted profiles
...
Bug: 8705996
Change-Id: Ibf6a2e0e14ce095758fb9be982710b584b76f15d
2013-04-24 14:21:06 -07:00
Maggie Benthall
ea1690ea5e
am 90dad640
: am 8bce7c37
: Merge "UI compliance for WifiSettings" into jb-mr2-dev
...
* commit '90dad6404c2810f9f4110ecec94000c84d7e456d':
UI compliance for WifiSettings
2013-04-24 13:03:19 -07:00
Maggie Benthall
8bce7c37d0
Merge "UI compliance for WifiSettings" into jb-mr2-dev
2013-04-24 19:58:24 +00:00
Maggie Benthall
91c016de41
UI compliance for WifiSettings
...
Rename and reword string that appears in WifiSettings when user is
restricted from modifying the networks.
Bug: 8696370
Change-Id: I1945550c05163ebff9602e4ba8ba890fece61265
2013-04-24 19:21:10 +00:00
Baligh Uddin
320b39352e
Import translations. DO NOT MERGE
...
Change-Id: I66918f809464bcc9baf0c171ab9baf972a528f99
Auto-generated-cl: translation import
2013-04-24 10:28:56 -07:00
Baligh Uddin
243ecbe4f4
Import translations. DO NOT MERGE
...
Change-Id: Iddaad41f96f86f10ac141f29c97beb396c949715
Auto-generated-cl: translation import
2013-04-24 10:25:21 -07:00
Amith Yamasani
69ce9d7367
am ed0cf41d
: am 99bde108
: Merge "Final refactoring of the user/profile settings screen." into jb-mr2-dev
...
* commit 'ed0cf41d3a36769b0f7b539e0456aff9d1795339':
Final refactoring of the user/profile settings screen.
2013-04-23 18:53:26 -07:00
Amith Yamasani
99bde10810
Merge "Final refactoring of the user/profile settings screen." into jb-mr2-dev
2013-04-24 01:49:07 +00:00
Amith Yamasani
fc8a383d42
Final refactoring of the user/profile settings screen.
...
Name restricted users as restricted profiles and group them all
together.
Bug: 8697415
Change-Id: I18acc6b61bfb12a8e1540eb022a73b29783789e1
2013-04-23 18:45:35 -07:00