Svetoslav
d346a1ca2d
Merge "The touch exploration capability is dynamically granted pre-JellyBeanMR2." into jb-mr2-dev
2013-04-25 01:44:50 +00:00
Svetoslav
5467207b47
The touch exploration capability is dynamically granted pre-JellyBeanMR2.
...
Since the enable touch exploration capability is dynamically granted by
the user for apps targeting pre-JellybeanMR2 API level, we have to avoid
caching copies of the service info.
Framework change:https://googleplex-android-review.googlesource.com/#/c/301722
bug:8633951
Change-Id: I2b409ca92931d1409e885d6f54e0f10cbece2e80
2013-04-24 15:06:21 -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
7200ae73c7
am 868acab2
: Merge "Rename limited users to restricted profiles" into jb-mr2-dev
...
* commit '868acab2a0e82330f6b278f4f93284ca1b6e6225':
Rename limited users to restricted profiles
2013-04-24 14:58:39 -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
Baligh Uddin
af6202f270
am cfa2954f
: (-s ours) am 243ecbe4
: Import translations. DO NOT MERGE
...
* commit 'cfa2954f1c3e0cf9dfcddea1e87e7637b1c4d585':
Import translations. DO NOT MERGE
2013-04-24 13:03:19 -07:00
Maggie Benthall
90dad6404c
am 8bce7c37
: Merge "UI compliance for WifiSettings" into jb-mr2-dev
...
* commit '8bce7c37d007a2e888c4742cf7ceee749ec573fa':
UI compliance for WifiSettings
2013-04-24 13:00:25 -07:00
Maggie Benthall
8bce7c37d0
Merge "UI compliance for WifiSettings" into jb-mr2-dev
2013-04-24 19:58:24 +00:00
Baligh Uddin
cfa2954f1c
am 243ecbe4
: Import translations. DO NOT MERGE
...
* commit '243ecbe4f4acf8af7c7bf588a869a070f239b274':
Import translations. DO NOT MERGE
2013-04-24 12:28:30 -07: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
The Android Automerger
901310445b
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-24 05:55:48 -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
ed0cf41d3a
am 99bde108
: Merge "Final refactoring of the user/profile settings screen." into jb-mr2-dev
...
* commit '99bde10810b4a261045e10b0190b1a8f9d7764ac':
Final refactoring of the user/profile settings screen.
2013-04-23 18:51:16 -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
Jake Hamby
ddfa75020e
am 92359444
: am 5e9bd86b
: Add support to display regulatory info from *#07#.
...
* commit '923594446499a63c62d2d93495ed5a0cdf83afbb':
Add support to display regulatory info from *#07#.
2013-04-23 15:27:16 -07:00
Jake Hamby
9235944464
am 5e9bd86b
: Add support to display regulatory info from *#07#.
...
* commit '5e9bd86bc6f89b1a743b04d69e793638ffb8cb41':
Add support to display regulatory info from *#07#.
2013-04-23 15:25:24 -07:00
Amith Yamasani
2c670af72a
am f76972ec
: am 2774bc44
: Merge "Fix repeating apps on pause/resume" into jb-mr2-dev
...
* commit 'f76972ec1f916805ff32ae09f56ab0e73b2b6df7':
Fix repeating apps on pause/resume
2013-04-23 15:01:34 -07:00
Jake Hamby
5e9bd86bc6
Add support to display regulatory info from *#07#.
...
Add a new action and Activity so the phone dialer can display
regulatory info via "*#07#".
Regulatory info is supplied per device by a Settings app resource
overlay. This overlay must set the boolean resource
"config_show_regulatory_info" to true, and provide either a drawable
named "regulatory_info.png" with the info in graphical form, or a
string resource named "regulatory_info_text" containing the required
information in HTML format.
Bug: 8259869
Change-Id: I73c1431a1a6d1736f9d3e4bd5be7e3771c85cbcb
2013-04-23 13:06:54 -07:00
Kenny Root
d119ce9daa
am 934ad54f
: am 73e396f8
: Merge "Fix Clear Credentials item" into jb-mr2-dev
...
* commit '934ad54f338a71baddac98c4bfeb67b070453984':
Fix Clear Credentials item
2013-04-23 11:23:42 -07:00
Baligh Uddin
266311bcc3
am f224d219
: (-s ours) am 9c4bba56
: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'f224d219bcef0d3f52627e00c7dd6aed43c480fc':
Import translations. DO NOT MERGE
2013-04-23 11:23:42 -07:00
Svetoslav
377d933181
am 5185b8bc
: am bf3391f1
: Adding UI for editing the name and the picture of a limited user.
...
* commit '5185b8bc271d17c4ffa9dc50cc9a204f5a74937f':
Adding UI for editing the name and the picture of a limited user.
2013-04-23 11:16:49 -07:00
Amith Yamasani
44396b974a
am e6910a4c
: am fce45015
: Merge "Several improvements and fixes in restrictions UI" into jb-mr2-dev
...
* commit 'e6910a4cf2e3675a68efe7fb019ea65d719df009':
Several improvements and fixes in restrictions UI
2013-04-23 11:16:48 -07:00
Amith Yamasani
f76972ec1f
am 2774bc44
: Merge "Fix repeating apps on pause/resume" into jb-mr2-dev
...
* commit '2774bc4413e103e79768ddace8356c997984513e':
Fix repeating apps on pause/resume
2013-04-23 10:15:52 -07:00
Amith Yamasani
2774bc4413
Merge "Fix repeating apps on pause/resume" into jb-mr2-dev
2013-04-23 17:13:46 +00:00
The Android Automerger
bb496899c9
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-23 05:55:51 -07:00
Kenny Root
934ad54f33
am 73e396f8
: Merge "Fix Clear Credentials item" into jb-mr2-dev
...
* commit '73e396f8ffcb89f466c8767ccd9864ec2b1cd203':
Fix Clear Credentials item
2013-04-23 03:51:45 -07:00
Baligh Uddin
f224d219bc
am 9c4bba56
: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '9c4bba564745dcaa2aaa63c156f6d11afe05202e':
Import translations. DO NOT MERGE
2013-04-23 03:51:13 -07:00
Svetoslav
5185b8bc27
am bf3391f1
: Adding UI for editing the name and the picture of a limited user.
...
* commit 'bf3391f19b6f1733825de07d9c602545f8818c64':
Adding UI for editing the name and the picture of a limited user.
2013-04-23 03:50:28 -07:00
Amith Yamasani
e6910a4cf2
am fce45015
: Merge "Several improvements and fixes in restrictions UI" into jb-mr2-dev
...
* commit 'fce4501512dbf00f6825abc37f91b6aea8b9dc28':
Several improvements and fixes in restrictions UI
2013-04-23 03:50:27 -07:00
Amith Yamasani
1bad7141b4
Fix repeating apps on pause/resume
...
Preference list was getting duplicated on pausing and resuming the activity.
Pull the user info out of the preference list and make it a static header
so that it stays fixed. Can now remove all entries before re-adding.
Disable location by default and disable ability to change Unknown sources
toggle.
Bug: 8685561
Bug: 8688400
Change-Id: I64ce728d5369e03ddaba562bcd66bb0720a037d2
2013-04-22 17:03:30 -07:00
Kenny Root
73e396f8ff
Merge "Fix Clear Credentials item" into jb-mr2-dev
2013-04-22 23:46:02 +00:00
Baligh Uddin
9c4bba5647
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-04-22 21:45:38 +00:00
Kenny Root
c4372c3e3f
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.
Bug: 8651830
Change-Id: I52a8262011d744d782b35d97deaabcba3b23f32b
2013-04-22 13:42:45 -07:00
Svetoslav
bf3391f19b
Adding UI for editing the name and the picture of a limited user.
...
A limited user may not have access to contacts, thus the settings
app has to be able to show UI for selecting a user photo from
gallery or via camera.
bug:8566861
Change-Id: I1974b1a19b0fee8c737d1345302e1b2fba108379
2013-04-22 12:12:05 -07:00
Baligh Uddin
0b7c1a2cbb
Import translations. DO NOT MERGE
...
Change-Id: I13ce0c3329228630c2fee94df2320e0c81cd1ddd
Auto-generated-cl: translation import
2013-04-22 11:07:27 -07:00
Baligh Uddin
8da80bab8b
Import translations. DO NOT MERGE
...
Change-Id: I08d8d19f84ddbc4ea46f4c750803af0d22199919
Auto-generated-cl: translation import
2013-04-22 11:04:06 -07:00
The Android Automerger
2cdf5190b3
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-22 05:56:06 -07:00
Amith Yamasani
fce4501512
Merge "Several improvements and fixes in restrictions UI" into jb-mr2-dev
2013-04-19 23:48:11 +00:00
Amith Yamasani
a98c402e44
Several improvements and fixes in restrictions UI
...
Bug: 8668906 : Add string indicating that the app has opted-in
Bug: 8663558 : Fix a crash in settings when EXTRA_RESTRICTIONS_LIST is empty
Also accept EXTRA_RESTRICTIONS_BUNDLE as a result from custom
restrictions activity
Bug: 8653389 : Some apps show up twice in the limited user config screen
Bug: 8653915 : Jank when adding a new limited user
Change-Id: I293148000be70850f565dbddb4c942d69142ae17
2013-04-19 16:27:09 -07:00
Fabrice Di Meglio
86782031b1
am 7c9b3acc
: am 88083a3e
: Merge "Fix bug #8665924 Native arabic numerals in the bluetooth pairing ui" into jb-mr2-dev
...
* commit '7c9b3accfc293581f48fa8475803fe2eb612ccdc':
Fix bug #8665924 Native arabic numerals in the bluetooth pairing ui
2013-04-19 14:38:45 -07:00
Fabrice Di Meglio
7c9b3accfc
am 88083a3e
: Merge "Fix bug #8665924 Native arabic numerals in the bluetooth pairing ui" into jb-mr2-dev
...
* commit '88083a3e04efcba725c721b0bcc60faa6b673bee':
Fix bug #8665924 Native arabic numerals in the bluetooth pairing ui
2013-04-19 14:23:10 -07:00
Fabrice Di Meglio
88083a3e04
Merge "Fix bug #8665924 Native arabic numerals in the bluetooth pairing ui" into jb-mr2-dev
2013-04-19 21:20:03 +00:00
Fabrice Di Meglio
ae8d5bdc5b
Fix bug #8665924 Native arabic numerals in the bluetooth pairing ui
...
- force LATIN digits for passkey
Change-Id: Ifc7fc746677df4c1e9013ecfe6e9f4887f2d4f1d
2013-04-19 13:50:59 -07:00
Matthew Xie
904218b00c
am 1c9e90d3
: am 89845158
: Merge "Change SettingsAppWidgetProvider export to be false" into jb-mr2-dev
...
* commit '1c9e90d3284173455ad0da5e02b1aa7372a9b8fc':
Change SettingsAppWidgetProvider export to be false
2013-04-19 12:49:31 -07:00
Matthew Xie
1c9e90d328
am 89845158
: Merge "Change SettingsAppWidgetProvider export to be false" into jb-mr2-dev
...
* commit '89845158de132a5aa2df683c3fe1d5a5fc0109e1':
Change SettingsAppWidgetProvider export to be false
2013-04-19 12:46:53 -07:00