Commit Graph

4672 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Satoshi Kataoka
05483828cf am c19a82a3: am b5b541a5: Merge "Fix sort order of InputMethodSubtype" into jb-mr2-dev
* commit 'c19a82a3798d8de616c72ce3993a330e021e2259':
  Fix sort order of InputMethodSubtype
2013-04-18 20:09:32 -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
Svetoslav
0fc0eb5a05 am 78c7c3fa: am 9e7a84e2: Merge "Replacing accessibility service permissions with capability attributes." into jb-mr2-dev
* commit '78c7c3faf62114a2197fbfa4dc319405c267b44d':
  Replacing accessibility service permissions with capability attributes.
2013-04-18 18:05:24 -07: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
Satoshi Kataoka
ef120bea7b Fix sort order of InputMethodSubtype
Bug: 8638372
Change-Id: I65d30f968708dc836635f687aa51b51816daccdb
2013-04-19 02:09:26 +09:00
Amith Yamasani
87aa98befe am ac395aae: am d4abdd27: Reorganize users screen
* commit 'ac395aaed59a70cb2b2eb36fa3b935cb0d12b20f':
  Reorganize users screen
2013-04-17 22:17:29 -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
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
fd3ef65132 am 8d37841e: am ebd61e36: Ensure WFD switch is removed along with settings fragment.
* commit '8d37841e26e6acca91d7c3d147f380d891e31cca':
  Ensure WFD switch is removed along with settings fragment.
2013-04-17 19:29:14 -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
19f09c37e1 am 71732616: am cf00931c: Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev
* commit '717326167bcf95ef64c8bf6f26a5b475fa1fddf9':
  Move owner info from Settings.Secure to LockSettings
2013-04-17 13:43:08 -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
a7a9fc4730 am 05f5437a: am 5ee17505: Changes to deal with restrictions API change
* commit '05f5437af1d7a6fa5ca27f9cadef0521c05ae09d':
  Changes to deal with restrictions API change
2013-04-17 11:34:29 -07: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
Amith Yamasani
5ee1750519 Changes to deal with restrictions API change
Bug: 8633967
Change-Id: I5d8e843c850ad3eff900409a9006666ddf91b061
2013-04-17 10:47:34 -07:00
Amith Yamasani
6bf778ef35 am ed89cb87: am e11a346f: Remove wifi/bt restrictions choice for limited users
* commit 'ed89cb8765154506cc712482ef3b6fcb804375f4':
  Remove wifi/bt restrictions choice for limited users
2013-04-16 16:01:49 -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
f4bfad995d am b7e49231: am c1e3983b: Merge "Fix NullPointerException at RunningState"
* commit 'b7e49231ff8c03120c80a28edc43eca83266497b':
  Fix NullPointerException at RunningState
2013-04-16 06:45:58 -07:00
Amith Yamasani
cfb26bbb5b am 728b6316: am 91b5fab9: Merge "Check if the Activity is finishing before showDialog()"
* commit '728b631653bfe5b9f69ad9c3d94819f06aa0f5fc':
  Check if the Activity is finishing before showDialog()
2013-04-16 06:45:57 -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
Amith Yamasani
c1e3983b31 Merge "Fix NullPointerException at RunningState" 2013-04-16 13:16:17 +00:00
Amith Yamasani
91b5fab9b0 Merge "Check if the Activity is finishing before showDialog()" 2013-04-16 13:13:53 +00:00
Jim Miller
99b50ae584 Move owner info from Settings.Secure to LockSettings
Fixes bug 8512972

Change-Id: I3eb68ace44c51daa012547908e28544a2d94847d
2013-04-15 20:27:55 -07:00
Kenny Root
0a10abbc83 am d56e4ad7: am 1a72d9c4: Merge "Remove old KeyStore API call sites" into jb-mr2-dev
* commit 'd56e4ad7738f588835c464d2e49f80114758e4bf':
  Remove old KeyStore API call sites
2013-04-15 13:52:56 -07:00