PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,657 Commits 1 Branch 0 Tags
2a0affe49917a260e89f16ed0d810daa65d3646c
Commit Graph

10657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emily Bernier
91d40b7d97 Merge "User restrictions for creds storage & user removal" into jb-mr2-dev 2013-04-12 20:22:04 +00:00
Amith Yamasani
90288faffd am a01f625f: am 35f02378: Merge "Embed the app restrictions fragment in the dual-pane settings." into jb-mr2-dev 
* commit 'a01f625f509b0491398b854c1f63562c80902330':
  Embed the app restrictions fragment in the dual-pane settings.
 2013-04-12 11:06:58 -07:00
Amith Yamasani
a01f625f50 am 35f02378: Merge "Embed the app restrictions fragment in the dual-pane settings." into jb-mr2-dev 
* commit '35f02378710a0fd33bf62d2d10e0c655fe07d519':
  Embed the app restrictions fragment in the dual-pane settings.
 2013-04-12 11:02:23 -07:00
Baligh Uddin
b87ba79a00 Import translations. DO NOT MERGE 
Change-Id: Ie2925e861248befe59ee0a356424786a616774f6
Auto-generated-cl: translation import
 2013-04-12 10:59:11 -07:00
Amith Yamasani
35f0237871 Merge "Embed the app restrictions fragment in the dual-pane settings." into jb-mr2-dev 2013-04-12 17:58:03 +00:00
Baligh Uddin
da9fa0a599 Import translations. DO NOT MERGE 
Change-Id: I55d1e2ad4c165c7098054dadaa79ea3e6896fc89
Auto-generated-cl: translation import
 2013-04-12 10:56:21 -07:00
Irfan Sheriff
bafefe0031 am 2cc2b0f2: am a2e64ac8: Merge "Limit device name length" into jb-mr2-dev 
* commit '2cc2b0f2cbae003eaca44e12333f754748ddb0c1':
  Limit device name length
 2013-04-12 10:38:25 -07:00
Irfan Sheriff
2cc2b0f2cb am a2e64ac8: Merge "Limit device name length" into jb-mr2-dev 
* commit 'a2e64ac8151bafc1f89a6aaa0fa53f049fba21ba':
  Limit device name length
 2013-04-12 09:59:41 -07:00
Irfan Sheriff
a2e64ac815 Merge "Limit device name length" into jb-mr2-dev 2013-04-12 16:55:13 +00:00
Irfan Sheriff
540f75aa92 Limit device name length 
Bug: 8599677
Change-Id: Ifce5579c0a65c98a4faaad286a7255b2e63d2a76
 2013-04-11 22:26:28 -07:00
Amith Yamasani
cc395695fc Embed the app restrictions fragment in the dual-pane settings. 
Change the limited user creation flow to show the usual message before
actually adding the user. Might need to customize the message for limited
users.

Removed the old activity wrapper and moved the logic to UserSettings.

Removed the finish button.

Bug: 8566751
Change-Id: Ie9e1a03736c41758b0bb6e79d004ad662a5af7f4
 2013-04-11 18:21:07 -07:00
Emily Bernier
11bd33a564 User restrictions for creds storage & user removal 
Change-Id: I423e729f73ece6209875d2f8d194d0d11c975c20
 2013-04-11 19:54:57 -04:00
Benjamin Poiesz
f18d2fea2a am 2bd65910: am b0746763: Merge "Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker." into jb-mr2-dev 
* commit '2bd6591025aaf1d1b5a9a9d0d2ce5981617476b3':
  Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker.
 2013-04-11 15:18:02 -07:00
Benjamin Poiesz
2bd6591025 am b0746763: Merge "Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker." into jb-mr2-dev 
* commit 'b0746763ba79f2f002cf68d180bac6ab33e49f8d':
  Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker.
 2013-04-11 15:15:18 -07:00
Benjamin Poiesz
b0746763ba Merge "Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker." into jb-mr2-dev 2013-04-11 22:12:10 +00:00
Amith Yamasani
9d2d752654 am c077cd8d: am d8b0d0ed: Make sure Settings app restrictions show up 
* commit 'c077cd8dec7fab6b4224c123007789c1869164ed':
  Make sure Settings app restrictions show up
 2013-04-11 14:58:21 -07:00
Amith Yamasani
c077cd8dec am d8b0d0ed: Make sure Settings app restrictions show up 
* commit 'd8b0d0ed8e12c1c3f5c44d50ddf3a69aa8a2be72':
  Make sure Settings app restrictions show up
 2013-04-11 13:52:50 -07:00
Benjamin Poiesz
cbde502ebb Forcing the settings apk to be built with the zz_ZZ pseudolocale. 
This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker.

Bug #8556677

Change-Id: I68ffc81454865dec94a3c1460019d1efce00ea49
 2013-04-11 13:32:39 -07:00
Maggie Benthall
7e61c23306 Implement Settings app UX for when a user has wifi config locked down. 
When the user is restricted from configuring wifi:
- Leave the on/off button enabled
- Hide all menu options
- Hide all networks, and display a message saying:
 "This user is not allowed to configure wireless networks."

Change-Id: I20193b552ea071740686bd9091637459e9b668b5
 2013-04-11 15:45:58 -04:00
Amith Yamasani
d8b0d0ed8e Make sure Settings app restrictions show up 
Inadvertently disabled that in the previous change where we would
skip apps that were required but had no restrictions entries.

Bug: 8520185
Change-Id: Idc1808e489f7b6da267f68a2c7cef81cc351d2d0
 2013-04-11 11:12:35 -07:00
The Android Open Source Project
fe69f9a238 am d8a4eed4: Reconcile with jb-mr2-release - do not merge 
* commit 'd8a4eed4889b5b7f2411e5beeb1f138d10b196c9':
 2013-04-11 07:50:52 -07:00
The Android Open Source Project
d8a4eed488 Reconcile with jb-mr2-release - do not merge 
Change-Id: I18995b65eb42855a0e4559731b1c180ab12f34f5
 2013-04-11 07:45:28 -07:00
Maggie Benthall
c20bc9f1cd am 2def3df6: am 3c3fa0cc: Merge "Implement Settings app UX for when a user has bluetooth config locked down." into jb-mr2-dev 
* commit '2def3df600d13000855ce352536b49094d746be4':
  Implement Settings app UX for when a user has bluetooth config locked down.
 2013-04-11 07:12:06 -07:00
Maggie Benthall
2def3df600 am 3c3fa0cc: Merge "Implement Settings app UX for when a user has bluetooth config locked down." into jb-mr2-dev 
* commit '3c3fa0ccb8bf9f62558202e909cc158a2e673e37':
  Implement Settings app UX for when a user has bluetooth config locked down.
 2013-04-11 07:08:37 -07:00
Maggie Benthall
3c3fa0ccb8 Merge "Implement Settings app UX for when a user has bluetooth config locked down." into jb-mr2-dev 2013-04-11 14:04:40 +00:00
The Android Automerger
e41164e928 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-11 05:55:58 -07:00
Amith Yamasani
8ce6386484 am 7805d74c: am d81a3f73: Improve app list for limited users 
* commit '7805d74cd7710c868bdebae872c79470b622c86f':
  Improve app list for limited users
 2013-04-10 22:16:15 -07:00
Amith Yamasani
7805d74cd7 am d81a3f73: Improve app list for limited users 
* commit 'd81a3f73680372ba93a2a26a445d148220c1a521':
  Improve app list for limited users
 2013-04-10 22:13:09 -07:00
Amith Yamasani
d81a3f7368 Improve app list for limited users 
Show all activities in the same package with a master/slave relationship,
toggling all when the master is toggled.
Don't show required apps that have no restrictions.
Show apps that are only installed on the target user.

Bug: 8520813 lowercase app names
Bug: 8520185 apps installed only in limited user
Bug: 8567000 strange behavior with apps that have two launcher icons
Change-Id: Id8ab296c13202735a9534f918bd81ea4b4c14b46
 2013-04-10 21:59:18 -07:00
Svetoslav
549857a8b4 am fce2148f: am 96cd9e7c: First accessibility device disabled if enableing a second one is canceled. 
* commit 'fce2148f3c679ef12ee59a8dcf071e34cea100f5':
  First accessibility device disabled if enableing a second one is canceled.
 2013-04-10 18:22:49 -07:00
Svetoslav
fce2148f3c am 96cd9e7c: First accessibility device disabled if enableing a second one is canceled. 
* commit '96cd9e7cc7d830756f42aa715e0062f938d4ae55':
  First accessibility device disabled if enableing a second one is canceled.
 2013-04-10 17:56:25 -07:00
Svetoslav
96cd9e7cc7 First accessibility device disabled if enableing a second one is canceled. 
The value whether accessibility should stay enabled was incorrectly
computed and as a result accessibility was disaabled when the second
accessibility service enabling is canceled.

bug:7716830

Change-Id: Ic23c24b1ffa90811e21210aeeca158568ad37904
 2013-04-10 17:33:42 -07:00
Dianne Hackborn
ab27d31a81 am 5d46a54c: am 8c94273c: Merge "Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev 
* commit '5d46a54c55a4e48332905bd927c24bc2544e2893':
  Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats
 2013-04-10 14:18:56 -07:00
Dianne Hackborn
5d46a54c55 am 8c94273c: Merge "Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev 
* commit '8c94273c73480c35ee0af8910b32f0d4dec48132':
  Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats
 2013-04-10 14:16:34 -07:00
Dianne Hackborn
8c94273c73 Merge "Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev 2013-04-10 21:14:22 +00:00
Baligh Uddin
2256dc2dfa am 8059d27e: am fdc5489b: Import translations. DO NOT MERGE 
* commit '8059d27e73e89fd207ddbd3688c28b0dade11d78':
  Import translations. DO NOT MERGE
 2013-04-10 13:03:31 -07:00
Baligh Uddin
8059d27e73 am fdc5489b: Import translations. DO NOT MERGE 
* commit 'fdc5489b56a0432b1b05fd2cc36d8b729d9fabf5':
  Import translations. DO NOT MERGE
 2013-04-10 13:00:33 -07:00
Baligh Uddin
6bb143a9be Merge "Import translations. DO NOT MERGE" 2013-04-10 19:56:33 +00:00
Dianne Hackborn
1d675e6546 Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats 
Should be comparing with Bluetooth UID, not the wrong and broken GID.

Change-Id: I2cb33e25b0ae5a441a467c12d91860dcf36232dc
 2013-04-10 12:50:32 -07:00
Baligh Uddin
8c37212d09 Import translations. DO NOT MERGE 
Change-Id: Id2b91f9699560cd2f7a4858c9b96c8782a6a0601
Auto-generated-cl: translation import
 2013-04-10 11:30:34 -07:00
Baligh Uddin
fdc5489b56 Import translations. DO NOT MERGE 
Change-Id: Ifb727fcd1cfd28e78a2f405ee5cbba21e1999ab3
Auto-generated-cl: translation import
 2013-04-10 11:27:46 -07:00
The Android Open Source Project
b544e4f76d am 122bfe4f: Reconcile with jb-mr2-release - do not merge 
* commit '122bfe4f0495c22f1c18e4d79d7d20c2f3795114':
  Potential fix for a monkey-related NPE
 2013-04-10 10:08:20 -07:00
The Android Open Source Project
122bfe4f04 Reconcile with jb-mr2-release - do not merge 
Change-Id: I5597c4b46c146b190370d63e0128d2d84f80888a
 2013-04-10 10:06:01 -07:00
The Android Automerger
071d2cf06f merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-10 05:56:49 -07:00
Amith Yamasani
e2367654b6 am 0c8f9246: am 80b1dfe4: Merge "Select text in user name dialog" into jb-mr2-dev 
* commit '0c8f9246437234a0de217feb339c5811012bea5c':
  Select text in user name dialog
 2013-04-09 17:33:13 -07:00
Amith Yamasani
0c8f924643 am 80b1dfe4: Merge "Select text in user name dialog" into jb-mr2-dev 
* commit '80b1dfe46a85e3ecdbeca5575c205086e5ab07e0':
  Select text in user name dialog
 2013-04-09 17:30:51 -07:00
Amith Yamasani
80b1dfe46a Merge "Select text in user name dialog" into jb-mr2-dev 2013-04-10 00:29:12 +00:00
Amith Yamasani
583757908b Select text in user name dialog 
Enables quickly changing the name without moving the cursor.
Also use cap words style.

Bug: 8518507
Change-Id: I6841cad221b56bb4c3d51c21d30b3858d1ee3e1c
 2013-04-09 17:26:43 -07:00
Amith Yamasani
3727018a5a Potential fix for a monkey-related NPE 
Cache the content resolver so that async callbacks, events can
continue to get the cntent resolver when detached from the activity.
This should help with stability.

Bug: 8005271

Change-Id: Ia566bc312ce678b438004bdf4ed7537ac1604608
 2013-04-09 16:05:16 -07:00
Wink Saville
69e57fa7f3 am 9f5f4fdd: am 460f2478: Merge "Add FW support for CellInfo RIL commands." into jb-mr2-dev 
* commit '9f5f4fdde61fabb634885e71f845d8d3c1fc9c7b':
  Add FW support for CellInfo RIL commands.
 2013-04-09 16:02:04 -07:00