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
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
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
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
Matthew Xie
89845158de
Merge "Change SettingsAppWidgetProvider export to be false" into jb-mr2-dev
2013-04-19 18:42:54 +00:00
Jean Chalard
89d02a52e0
am 0ac95054
: Add hints to some text fields for RTL
...
* commit '0ac950542d86c6803b80d0fd73f0508a687d225b':
Add hints to some text fields for RTL
2013-04-19 10:33:06 -07:00
Jean Chalard
0ac950542d
Add hints to some text fields for RTL
...
Having a hint makes sure the cursor is positioned in the right
end of the text field by default for both LTR and RTL locales.
This fixes the user dictionary "add to dictionary" interface
parts, and the "connect to hidden network" interface.
Bug: 8654823
Change-Id: I7c83d35734e53da94bb949e362c5260934ef0b76
2013-04-19 22:05:53 +09:00
Matthew Xie
89d44ec66c
Change SettingsAppWidgetProvider export to be false
...
This will protect settings from external broadcaster.
bug 7961958
Change-Id: Id6d0bf83ef19f2b5c2641231cba2dc65a1492797
2013-04-18 23:43:42 -07:00
Satoshi Kataoka
c19a82a379
am b5b541a5
: Merge "Fix sort order of InputMethodSubtype" into jb-mr2-dev
...
* commit 'b5b541a5776b95a985512b3bf694cac2301d8f06':
Fix sort order of InputMethodSubtype
2013-04-18 20:06:21 -07:00
Satoshi Kataoka
b5b541a577
Merge "Fix sort order of InputMethodSubtype" into jb-mr2-dev
2013-04-19 03:04:27 +00:00
Dianne Hackborn
d356c0387e
am d410350b
: Merge "Fix issue #8647812 : Hide app ops choice from settings shortcut" into jb-mr2-dev
...
* commit 'd410350b5e1b55f306e6fe0dba866034df7556e8':
Fix issue #8647812 : Hide app ops choice from settings shortcut
2013-04-18 18:29:59 -07:00
Dianne Hackborn
d410350b5e
Merge "Fix issue #8647812 : Hide app ops choice from settings shortcut" into jb-mr2-dev
2013-04-19 01:27:07 +00:00
Svetoslav
78c7c3faf6
am 9e7a84e2
: Merge "Replacing accessibility service permissions with capability attributes." into jb-mr2-dev
...
* commit '9e7a84e2684e94ea5ea2e036b9bb4f214cedab2e':
Replacing accessibility service permissions with capability attributes.
2013-04-18 18:01:32 -07:00
Svetoslav
9e7a84e268
Merge "Replacing accessibility service permissions with capability attributes." into jb-mr2-dev
2013-04-19 00:57:00 +00:00
Dianne Hackborn
5125862bf7
Fix issue #8647812 : Hide app ops choice from settings shortcut
...
Change-Id: Ifa26a70f4614d3530cc27b360df2b6d5f03b28e3
2013-04-18 15:07:19 -07:00
Satoshi Kataoka
ef120bea7b
Fix sort order of InputMethodSubtype
...
Bug: 8638372
Change-Id: I65d30f968708dc836635f687aa51b51816daccdb
2013-04-19 02:09:26 +09:00
The Android Automerger
03784dd437
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-18 05:56:00 -07:00
Amith Yamasani
ac395aaed5
am d4abdd27
: Reorganize users screen
...
* commit 'd4abdd27adac36e7243bcaae37a7a2c69ac73db7':
Reorganize users screen
2013-04-17 22:15:03 -07:00
Amith Yamasani
d4abdd27ad
Reorganize users screen
...
As per product/ux feedback, move around and rename the users.
Settings button for some users.
Fix crash in limited user when clicking on the user:
Bug: 8494377
Change-Id: I346d12646d32608b01f2c2c2c866b6da51408618
2013-04-17 21:55:06 -07:00
Baligh Uddin
51a860fe9b
am 4e8cbb32
: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '4e8cbb32a2ecef9c0bbdaaeb97e6fc29ec14a902':
Import translations. DO NOT MERGE
2013-04-17 20:45:06 -07:00
Baligh Uddin
4e8cbb32a2
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-04-18 03:41:23 +00:00
Svetoslav
8fdc564cd3
Replacing accessibility service permissions with capability attributes.
...
Accessibility services can perform special operations such as retrieve
the screen content, enable explore by touch, etc. To ensure the user
is aware that the service will perform special operations we were using
permissions. However, the special operations cannot be performed unless
the service is really enabled by the user and it is at this point that
we want to notify the user about the service capabilities.
This change adds the list of the service capabilities to the enable
warining dialog such that the user can asses whether to he/she is fine
with this service performing certain special operations.
Main change:https://googleplex-android-review.googlesource.com/#/c/298110/
bug:8633951
Change-Id: I1617fa82126b9a674cb74a15d7004a7cc007c7d3
2013-04-17 20:18:59 -07:00
Jeff Brown
8d37841e26
am ebd61e36
: Ensure WFD switch is removed along with settings fragment.
...
* commit 'ebd61e36b2de03e5ccf2ab590cc44c817a3888ff':
Ensure WFD switch is removed along with settings fragment.
2013-04-17 19:26:20 -07:00
Jeff Brown
ebd61e36b2
Ensure WFD switch is removed along with settings fragment.
...
Bug: 8340072
Change-Id: I8d203725ef1bfa5b1b5e5c224fa57d5feaa9db5a
2013-04-17 19:22:05 -07:00
Jim Miller
717326167b
am cf00931c
: Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev
...
* commit 'cf00931c09a39e89806649a69c96a98bd7619368':
Move owner info from Settings.Secure to LockSettings
2013-04-17 13:40:55 -07:00
Jim Miller
cf00931c09
Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev
2013-04-17 20:37:29 +00:00
Amith Yamasani
05f5437af1
am 5ee17505
: Changes to deal with restrictions API change
...
* commit '5ee175051951d3a0bc1533aece69af520c295d37':
Changes to deal with restrictions API change
2013-04-17 11:30:42 -07:00
Baligh Uddin
cdd3238b67
Import translations. DO NOT MERGE
...
Change-Id: I04afe54c24573ae6980c1140aede0e0d3b0a06f8
Auto-generated-cl: translation import
2013-04-17 11:15:26 -07:00
Amith Yamasani
5ee1750519
Changes to deal with restrictions API change
...
Bug: 8633967
Change-Id: I5d8e843c850ad3eff900409a9006666ddf91b061
2013-04-17 10:47:34 -07:00
The Android Automerger
2f135e1f18
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-17 05:55:48 -07:00
Amith Yamasani
ed89cb8765
am e11a346f
: Remove wifi/bt restrictions choice for limited users
...
* commit 'e11a346f1fe6adeb183e7dfb622ac6ab40016794':
Remove wifi/bt restrictions choice for limited users
2013-04-16 15:59:01 -07:00
Amith Yamasani
e11a346f1f
Remove wifi/bt restrictions choice for limited users
...
Bug: 8631653
Make "Unknown sources" visible but disabled if restricted for limited user.
Bug: 8629605
Also show the restriction name as the dialog title in the picker.
Change-Id: I8d6ea3571bcc4372347cad6a2c982f35afa7cc09
2013-04-16 15:39:47 -07:00
Amith Yamasani
b7e49231ff
am c1e3983b
: Merge "Fix NullPointerException at RunningState"
...
* commit 'c1e3983b319ae4998ede94742db5462d01f53b73':
Fix NullPointerException at RunningState
2013-04-16 06:43:05 -07:00
Amith Yamasani
728b631653
am 91b5fab9
: Merge "Check if the Activity is finishing before showDialog()"
...
* commit '91b5fab9b0e8338850fe2838311a0801fddf31d4':
Check if the Activity is finishing before showDialog()
2013-04-16 06:43:04 -07:00