OSDN Git Service
Russell Brenner [Tue, 28 May 2013 20:23:35 +0000 (13:23 -0700)]
am
c280acc3: Merge "Improved logic for Skip warning message" into jb-mr2-dev
* commit '
c280acc327fa7e8fbd6972534fbadb4650c1ee3d':
Improved logic for Skip warning message
Russell Brenner [Tue, 28 May 2013 20:22:40 +0000 (20:22 +0000)]
Merge "Improved logic for Skip warning message" into jb-mr2-dev
The Android Open Source Project [Tue, 28 May 2013 14:37:45 +0000 (07:37 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: If34271bddb2819de365f53ba61b744b6598bda57
The Android Automerger [Sun, 26 May 2013 12:55:43 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Russell Brenner [Fri, 24 May 2013 21:28:08 +0000 (14:28 -0700)]
Improved logic for Skip warning message
Use ConnectivityManager instead of TelephonyManager to determine
how device is connected.
Bug:
9118704
Change-Id: I5c1db90500591ca67e927976066a46e1f66e2e60
Baligh Uddin [Thu, 23 May 2013 16:30:23 +0000 (09:30 -0700)]
am
6fa5e627: Import translations. DO NOT MERGE
* commit '
6fa5e627b8fd64af6e4ae286c46b3666b66f8d8a':
Import translations. DO NOT MERGE
The Android Open Source Project [Thu, 23 May 2013 15:05:45 +0000 (08:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ide88244c344b65f9c0c84b40e4ca76bccf67584c
The Android Automerger [Thu, 23 May 2013 12:55:31 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Baligh Uddin [Thu, 23 May 2013 07:31:54 +0000 (00:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I42d8fcaccbdec16d54e85adcd73e4c455097715d
Auto-generated-cl: translation import
Amith Yamasani [Wed, 22 May 2013 22:07:00 +0000 (15:07 -0700)]
am
21f008e1: Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev
* commit '
21f008e1f4e2d5e84fdab041d2ef31f305bbcf09':
Update strings for clarity about restricted profiles
Amith Yamasani [Wed, 22 May 2013 22:04:59 +0000 (22:04 +0000)]
Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev
Alex Klyubin [Wed, 22 May 2013 21:09:10 +0000 (14:09 -0700)]
am
7229e29f: Merge "Ensure all active Device Admins are listed." into jb-mr2-dev
* commit '
7229e29f1749ae10bd92b59ec3d663698a5045e7':
Ensure all active Device Admins are listed.
Alex Klyubin [Wed, 22 May 2013 21:06:32 +0000 (21:06 +0000)]
Merge "Ensure all active Device Admins are listed." into jb-mr2-dev
Dianne Hackborn [Wed, 22 May 2013 21:01:26 +0000 (14:01 -0700)]
am
8274b677: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
8274b6770219a469ab8a5254206d0d81bd5c96d3':
Fix issue #
9074296: Device Admins can activate in a way...
Amith Yamasani [Wed, 22 May 2013 19:51:30 +0000 (12:51 -0700)]
Update strings for clarity about restricted profiles
Bug:
9051422
Bug:
9051178
Change-Id: I1b88286fdd0db27bb6980d0ebbc846370fd0082e
Dianne Hackborn [Wed, 22 May 2013 18:29:36 +0000 (11:29 -0700)]
Fix issue #
9074296: Device Admins can activate in a way...
...that makes it impossible to deactive/uninstall them
Don't allow device admins to directly launch the add UI if
they are malformed.
Change-Id: I0d3140222d8015f680e1f199bddae2221ee0e726
Alex Klyubin [Wed, 22 May 2013 16:06:35 +0000 (09:06 -0700)]
Ensure all active Device Admins are listed.
Bug:
9074296
Change-Id: Ifb70c12ccea6628042b98a18186816887cb4477b
The Android Open Source Project [Wed, 22 May 2013 14:23:09 +0000 (07:23 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I2a202b7c38568ae9ca45a38cc01f08be05ab5d23
The Android Automerger [Wed, 22 May 2013 12:55:35 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Amith Yamasani [Wed, 22 May 2013 01:16:50 +0000 (18:16 -0700)]
am
0b2781ae: Write restriction bundle right away for required apps.
* commit '
0b2781ae537e6d3d27863080eea0a0a5fa6c83b8':
Write restriction bundle right away for required apps.
Amith Yamasani [Tue, 21 May 2013 23:07:28 +0000 (16:07 -0700)]
Write restriction bundle right away for required apps.
User shouldn't have to go tap on the settings icon for an app that is ON by default
in a restricted profile. This way apps can write some defaults to the restricted
profile when it is created.
The app entry is also automatically removed from the list if there are no visible
restrictions.
Bug:
9074051
Also fix an incorrect dialog label. Bug:
9068877
Change-Id: I2a7ddc31fe695f58611d2ba36a8bf541b7817b10
The Android Open Source Project [Tue, 21 May 2013 15:59:23 +0000 (08:59 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I6a178af29be7f1d227b667ec84312f5d0c2fdadd
The Android Automerger [Tue, 21 May 2013 14:47:00 +0000 (07:47 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Amith Yamasani [Tue, 21 May 2013 01:24:23 +0000 (18:24 -0700)]
am
b514a95c: am
4abe488a: Merge "No back icon in action bar of APN Settings"
* commit '
b514a95ce7009a61532f00d4ac5ab73861d2b327':
No back icon in action bar of APN Settings
Amith Yamasani [Tue, 21 May 2013 01:16:42 +0000 (18:16 -0700)]
am
4abe488a: Merge "No back icon in action bar of APN Settings"
* commit '
4abe488a5f18d04513b294dce1f7f63d0c9cf3a0':
No back icon in action bar of APN Settings
Amith Yamasani [Tue, 21 May 2013 00:39:29 +0000 (17:39 -0700)]
am
f88e6e5a: Don\'t mutate all instances of app icons in Settings
* commit '
f88e6e5ae6a5a31d47677dcbd9be2b26c6615136':
Don't mutate all instances of app icons in Settings
Amith Yamasani [Mon, 20 May 2013 22:56:47 +0000 (15:56 -0700)]
Don't mutate all instances of app icons in Settings
When adding color filters to an app icon in User Settings, don't
modify the original drawable state. Get a mutable drawable.
Bug:
9054675
Change-Id: I6ea374cb801abef3f5b597fda2e84b4e67cfa9d0
Amith Yamasani [Mon, 20 May 2013 18:07:21 +0000 (18:07 +0000)]
Merge "No back icon in action bar of APN Settings"
The Android Open Source Project [Mon, 20 May 2013 15:20:38 +0000 (08:20 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I82e5359280f8eeb68b9ef61dc4acb3804d8f9106
smitha.x.smitha [Tue, 23 Apr 2013 09:15:09 +0000 (14:45 +0530)]
No back icon in action bar of APN Settings
When entering the APN menu, the actionbar is missing a back
icon allowing the user to go back to the previous pane.
Added parentActivityName in ApnSettings, to enable action
bar back icon.
Change-Id: Iee8bb420f47c0e2c0d9a43739f534466abba30db
The Android Automerger [Sun, 19 May 2013 12:55:41 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Amith Yamasani [Sat, 18 May 2013 00:39:19 +0000 (17:39 -0700)]
am
b96ebf9e: Merge "Load the avatar icon if it\'s not yet in the activity view" into jb-mr2-dev
* commit '
b96ebf9eed3df26e523055fde98913507e6b1a8a':
Load the avatar icon if it's not yet in the activity view
Amith Yamasani [Sat, 18 May 2013 00:37:14 +0000 (00:37 +0000)]
Merge "Load the avatar icon if it's not yet in the activity view" into jb-mr2-dev
Baligh Uddin [Fri, 17 May 2013 22:39:53 +0000 (15:39 -0700)]
am
27d5c392: Import translations. DO NOT MERGE
* commit '
27d5c392ba6ce9f9ab4bbc71b2cdfea15c0140f2':
Import translations. DO NOT MERGE
Amith Yamasani [Fri, 17 May 2013 20:32:26 +0000 (13:32 -0700)]
Load the avatar icon if it's not yet in the activity view
Save any changes that weren't committed yet, but don't restore
earlier cancelled changes.
Bug:
9008014
Change-Id: I8faacc42a3600d1338ddedb1b59f7307903743b4
The Android Open Source Project [Fri, 17 May 2013 19:54:50 +0000 (12:54 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id11469f5fc48fc2af186000e2eb8ade5fb5264ab
Baligh Uddin [Fri, 17 May 2013 19:17:02 +0000 (12:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idaa8cda2a62a48bfaf80cd2a3c848ab99179dcda
Auto-generated-cl: translation import
John Spurlock [Thu, 16 May 2013 15:38:25 +0000 (08:38 -0700)]
am
31ce86d3: Merge "Hide notification listeners setting if no listeners." into jb-mr2-dev
* commit '
31ce86d3bd69a2c7e7bdfec3cf9317d53f7ec1df':
Hide notification listeners setting if no listeners.
John Spurlock [Thu, 16 May 2013 15:36:26 +0000 (15:36 +0000)]
Merge "Hide notification listeners setting if no listeners." into jb-mr2-dev
The Android Automerger [Thu, 16 May 2013 12:55:44 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Thu, 16 May 2013 12:44:09 +0000 (05:44 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Iae037f50e82720a2eb374281a91bb9638b8f7985
Amith Yamasani [Thu, 16 May 2013 00:12:02 +0000 (17:12 -0700)]
am
e5fc4071: Merge "Return proper result code after creating pin/password lock" into jb-mr2-dev
* commit '
e5fc407146c3f09e3bcd55d907fdffe2d26f3c6d':
Return proper result code after creating pin/password lock
Amith Yamasani [Thu, 16 May 2013 00:01:42 +0000 (00:01 +0000)]
Merge "Return proper result code after creating pin/password lock" into jb-mr2-dev
Amith Yamasani [Wed, 15 May 2013 18:26:19 +0000 (11:26 -0700)]
Return proper result code after creating pin/password lock
When adding a new restricted profile, user must enter some lockscreen
security. For PIN/password, return the result code (instead of cancelled)
so that UserSettings can proceed with adding the profile.
Bug:
8909229
Change-Id: I3567d7dfac869e38762f9e2a45d8ec83c51fa657
John Spurlock [Wed, 15 May 2013 13:38:10 +0000 (09:38 -0400)]
Hide notification listeners setting if no listeners.
Hide the new notification listeners management setting when
no listeners using this API are available.
Bug:
8454150
Change-Id: Iae9f975e7b5a3cdf55ff7d0c6aea7e84166d53b3
The Android Automerger [Wed, 15 May 2013 12:55:42 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Amith Yamasani [Tue, 14 May 2013 21:56:13 +0000 (14:56 -0700)]
am
00dc15d9: Merge "Add a settings icon to restricted profile config header" into jb-mr2-dev
* commit '
00dc15d9dab780e9a61d1b3a20446d6519b5b076':
Add a settings icon to restricted profile config header
Amith Yamasani [Tue, 14 May 2013 21:54:27 +0000 (21:54 +0000)]
Merge "Add a settings icon to restricted profile config header" into jb-mr2-dev
The Android Automerger [Tue, 14 May 2013 12:55:44 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Amith Yamasani [Mon, 13 May 2013 21:54:48 +0000 (14:54 -0700)]
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
Robert Greenwalt [Mon, 13 May 2013 21:13:48 +0000 (14:13 -0700)]
am
d5d61a0a: Merge "Remove wifi scan-always dialog." into jb-mr2-dev
* commit '
d5d61a0ab18c57cf2087d17f10d4d4569d968078':
Remove wifi scan-always dialog.
Robert Greenwalt [Mon, 13 May 2013 21:11:19 +0000 (21:11 +0000)]
Merge "Remove wifi scan-always dialog." into jb-mr2-dev
Robert Greenwalt [Mon, 13 May 2013 18:39:08 +0000 (11:39 -0700)]
Remove wifi scan-always dialog.
When wifi is switched off we no longer want a notification dialog
about scan-always, instead using in-panel text.
bug:
8907190
Change-Id: I707f306a056068d92f69070873f1e6330b598b1e
Baligh Uddin [Mon, 13 May 2013 16:50:06 +0000 (09:50 -0700)]
am
0a3cf293: Import translations. DO NOT MERGE
* commit '
0a3cf29344bcfd7071975c9f266574454209aa95':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 13 May 2013 16:42:52 +0000 (09:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7bfc101728e9083d730511df65771c9899ab6549
Auto-generated-cl: translation import
The Android Automerger [Thu, 9 May 2013 12:55:41 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Svetoslav [Wed, 8 May 2013 21:37:00 +0000 (14:37 -0700)]
am
7e554395: Merge "Settings crashing if there are no installed accessibility services." into jb-mr2-dev
* commit '
7e554395cbf3d3c1043e99fb080bd9148832c225':
Settings crashing if there are no installed accessibility services.
Svetoslav [Wed, 8 May 2013 21:33:13 +0000 (21:33 +0000)]
Merge "Settings crashing if there are no installed accessibility services." into jb-mr2-dev
Svetoslav [Wed, 8 May 2013 19:14:15 +0000 (12:14 -0700)]
Settings crashing if there are no installed accessibility services.
If there is no installed accessibility services and the user goes into
the accessibility settings section, the app crashes. This is due to a
lacking null pointer check against the list of installed services
returned by the accessibility manager. We should not have returned
null, rather an empty list - too late now, sigh...
bug:
8871034
Change-Id: Id3800d398af83868862847fa7ed861a9dee61c8f
Baligh Uddin [Wed, 8 May 2013 18:28:49 +0000 (11:28 -0700)]
am
2c766ba5: Import translations. DO NOT MERGE
* commit '
2c766ba56c740ec09f071144014272f4d922d518':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 8 May 2013 18:03:17 +0000 (11:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I693437e166d38e6b56a9b568c455daebfde8694d
Auto-generated-cl: translation import
The Android Automerger [Tue, 7 May 2013 12:55:42 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Baligh Uddin [Mon, 6 May 2013 19:31:30 +0000 (12:31 -0700)]
am
c6adece0: Import translations. DO NOT MERGE
* commit '
c6adece066c2bc282db92547913a8aa43831c5f0':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 6 May 2013 18:59:20 +0000 (11:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib1986e8c494733193e49c1504a4cc9396649a324
Auto-generated-cl: translation import
Baligh Uddin [Mon, 6 May 2013 18:11:29 +0000 (11:11 -0700)]
am
6681e954: Import translations. DO NOT MERGE
* commit '
6681e954a8d05d818b9bd89a1302ac2d8875ab77':
Import translations. DO NOT MERGE
The Android Automerger [Mon, 6 May 2013 12:55:52 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Baligh Uddin [Fri, 3 May 2013 20:12:52 +0000 (13:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6905b70a4bfdbab57f787be455fead0a995904a2
Auto-generated-cl: translation import
The Android Automerger [Thu, 2 May 2013 12:55:40 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Baligh Uddin [Wed, 1 May 2013 20:48:35 +0000 (13:48 -0700)]
am
6c886cd3: Import translations. DO NOT MERGE
* commit '
6c886cd394e0960a1ed41a785e05b38a57ee8209':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 1 May 2013 17:43:33 +0000 (10:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I09ddb61e89b8dfee57a2a4e6c3331a0737f1f290
Auto-generated-cl: translation import
The Android Automerger [Wed, 1 May 2013 12:56:00 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jake Hamby [Wed, 1 May 2013 00:04:59 +0000 (17:04 -0700)]
am
18c4317b: Show correct A2DP connection status in Bluetooth settings.
* commit '
18c4317b93fce47109017efdab089dec4b01f790':
Show correct A2DP connection status in Bluetooth settings.
Baligh Uddin [Tue, 30 Apr 2013 23:42:39 +0000 (16:42 -0700)]
am
e3eb601d: Import translations. DO NOT MERGE
* commit '
e3eb601dc232ba9a14396ec26368e0a0f14084c7':
Import translations. DO NOT MERGE
Jake Hamby [Fri, 26 Apr 2013 21:38:15 +0000 (14:38 -0700)]
Show correct A2DP connection status in Bluetooth settings.
When BluetoothSettings is entered via QuickSettings while an A2DP
device is connected, we aren't showing the device connection
status in the UI, because the device list is created before we've
connected to the A2DP and Headset profile services, and we weren't
refreshing the device list UI after getting the callback for
onServiceConnected() and retrieving the list of connected devices.
Add a line to HeadsetServiceListener.onServiceConnected() to call
device.refresh() after we call device.onProfileStateChanged() to
refresh the device list UI. Also copy the logic into A2dpProfile's
onServiceConnected() callback so it will refresh the UI for any
connected A2DP devices.
The reason this bug doesn't show up when entering BT settings
from the main Settings screen is because the onServiceConnected()
callbacks happen before the device list is initialized, so the
UI items are created with the correct connection status. For the
same reason, the bug doesn't occur if the Settings app is already
running and we re-enter it via Bluetooth QuickSettings.
Bug:
8724247
Change-Id: I1a993636ecab18dd6e980e3b4d2485bbed256d74
The Android Automerger [Tue, 30 Apr 2013 12:56:17 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Baligh Uddin [Tue, 30 Apr 2013 07:42:26 +0000 (00:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I81f4941adbfc66c70b241062ae75b4740a065a08
Auto-generated-cl: translation import
Kenny Root [Tue, 30 Apr 2013 06:30:40 +0000 (23:30 -0700)]
resolved conflicts for merge of
3c10f535 to jb-mr2-dev-plus-aosp
Change-Id: Id4ab035f92f2a8bf1b1fefdfd22ba370e33e7829
Kenny Root [Tue, 30 Apr 2013 04:01:45 +0000 (04:01 +0000)]
Merge "Track change to JSSE provider"
Irfan Sheriff [Mon, 29 Apr 2013 23:01:56 +0000 (16:01 -0700)]
am
3caffdb3: Merge "Add reminder about scan settings on wifi off" into jb-mr2-dev
* commit '
3caffdb343ba0bcb71396c6077355b0606d2f9eb':
Add reminder about scan settings on wifi off
Irfan Sheriff [Mon, 29 Apr 2013 22:59:00 +0000 (22:59 +0000)]
Merge "Add reminder about scan settings on wifi off" into jb-mr2-dev
Amith Yamasani [Mon, 29 Apr 2013 21:15:57 +0000 (14:15 -0700)]
am
f162efee: Prompt to set a screen lock when adding a restricted profile
* commit '
f162efee8995c8d7a26992e72fe771c41b790e39':
Prompt to set a screen lock when adding a restricted profile
Amith Yamasani [Mon, 29 Apr 2013 17:43:05 +0000 (10:43 -0700)]
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
Kenny Root [Wed, 24 Apr 2013 05:38:23 +0000 (22:38 -0700)]
Track change to JSSE provider
Change-Id: I25d6612b12ab46b1f5c88c400b95bba1c023398a
Irfan Sheriff [Fri, 26 Apr 2013 22:11:26 +0000 (15:11 -0700)]
Add reminder about scan settings on wifi off
Notify the user that scans will be available when
wifi is turned off
Bug:
8732391
Change-Id: If232bfb9f6c3976059bde11280318901c35161e7
The Android Automerger [Mon, 29 Apr 2013 12:56:10 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Amith Yamasani [Mon, 29 Apr 2013 05:23:20 +0000 (22:23 -0700)]
am
b0171715: Three kinds of owner info - owner, user and profile
* commit '
b0171715876b672c94c8a5aaafde95ff47b234b4':
Three kinds of owner info - owner, user and profile
Amith Yamasani [Mon, 29 Apr 2013 05:13:22 +0000 (22:13 -0700)]
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
Amith Yamasani [Sun, 28 Apr 2013 05:01:09 +0000 (22:01 -0700)]
am
c5b03657: Merge "Save app toggle state as soon as possible" into jb-mr2-dev
* commit '
c5b036571ed2eeae73b0551848e7f7efdc016a52':
Save app toggle state as soon as possible
Amith Yamasani [Sun, 28 Apr 2013 04:58:53 +0000 (04:58 +0000)]
Merge "Save app toggle state as soon as possible" into jb-mr2-dev
Kenny Root [Sat, 27 Apr 2013 22:01:04 +0000 (15:01 -0700)]
am
c814271f: Merge "Fix Clear Credentials item"
* commit '
c814271fe4117a6c94a314a349edd8d7222cf2c0':
Fix Clear Credentials item
Kenny Root [Sat, 27 Apr 2013 21:39:30 +0000 (21:39 +0000)]
Merge "Fix Clear Credentials item"
Kenny Root [Mon, 22 Apr 2013 20:41:18 +0000 (13:41 -0700)]
Fix Clear Credentials item
This should be enabled whenever there is a credential in the keystore
since there can be unencrypted credentials in there now.
(cherry picked from commit
c4372c3e3fd2d0be54341973bd72ec618931057c)
Bug:
8651830
Change-Id: Ie06f20cf90f5a359975cb30d67052f8867b429b9
Amith Yamasani [Fri, 26 Apr 2013 21:55:01 +0000 (14:55 -0700)]
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
Svetoslav [Fri, 26 Apr 2013 22:16:50 +0000 (15:16 -0700)]
am
4b43e21c: Merge "Scroll if an accessibility setting description does not fit the screen." into jb-mr2-dev
* commit '
4b43e21c647864c8105394f353d4533777e7f9c7':
Scroll if an accessibility setting description does not fit the screen.
Svetoslav [Fri, 26 Apr 2013 22:14:46 +0000 (22:14 +0000)]
Merge "Scroll if an accessibility setting description does not fit the screen." into jb-mr2-dev
Baligh Uddin [Fri, 26 Apr 2013 21:53:26 +0000 (14:53 -0700)]
am
837526fc: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
837526fceaa39f88ac468406108faacd557f2d28':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 26 Apr 2013 21:50:35 +0000 (21:50 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Svetoslav [Fri, 26 Apr 2013 17:45:33 +0000 (10:45 -0700)]
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
Baligh Uddin [Fri, 26 Apr 2013 17:52:46 +0000 (10:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I902e886b71e60da9c34d682a8b7c4f2453c06375
Auto-generated-cl: translation import
Amith Yamasani [Fri, 26 Apr 2013 17:47:18 +0000 (10:47 -0700)]
am
a7a93784: Always include default system IMEs for restricted profiles
* commit '
a7a93784d1f9798d37cb618def1a558f8d626f0f':
Always include default system IMEs for restricted profiles