PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,665 Commits 1 Branch 0 Tags
992b4fceb32dfe9cd72457a4dcfa0056a33e28c8
Commit Graph

10665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
992b4fceb3 The Settings app needs privileged permissions 
Bug 8765951

Change-Id: I42cfc32d961967b0a52027cbfb7c80b628715577
 2013-06-17 11:43:23 -07:00
Baligh Uddin
c0d2ffbff8 am 44789f92: (-s ours) am f7c2889c: am 7f37c30b: (-s ours) Import translations. DO NOT MERGE 
* commit '44789f922bafbce8c818f2eaddbfb9c3fd77c5aa':
  Import translations. DO NOT MERGE
 2013-06-17 09:32:27 -07:00
Baligh Uddin
44789f922b am f7c2889c: am 7f37c30b: (-s ours) Import translations. DO NOT MERGE 
* commit 'f7c2889c451474eab1b4b86013e04b720eacc68e':
  Import translations. DO NOT MERGE
 2013-06-17 09:30:03 -07:00
Baligh Uddin
f7c2889c45 am 7f37c30b: (-s ours) Import translations. DO NOT MERGE 
* commit '7f37c30b713e29494f00c85916fc4fee246f2936':
  Import translations. DO NOT MERGE
 2013-06-17 09:27:45 -07:00
Baligh Uddin
7f37c30b71 Import translations. DO NOT MERGE 
Change-Id: I7da4461fe8f9c64191a5e0c46ae6d5ad4d7293a1
Auto-generated-cl: translation import
 2013-06-17 09:14:19 -07:00
Dianne Hackborn
d55de16354 Merge "Following renaming of battery stats." 2013-06-15 00:39:49 +00:00
Chong Zhang
8d42ac22de Merge "wifi-display: use new getDisplays() method of WifiDisplayStatus" 2013-06-15 00:36:34 +00:00
Chong Zhang
94417b41c0 wifi-display: use new getDisplays() method of WifiDisplayStatus 
which returns a list of all displays including currently availabe
and remembered ones, each display has properties indicating it's
availability, remembered and canConnect status

Bug 9229799

Change-Id: I1f74b9c41abdfecc10e7bc1853929e982c44be2f
 2013-06-14 15:48:02 -07:00
Dianne Hackborn
b05bc1454a Following renaming of battery stats. 
Change-Id: I889680dddf18fb2a480017199cc072a2d1469c27
 2013-06-14 15:22:18 -07:00
Jean Chalard
d4d98e3e3d Merge "Fix a bug where a user dict entry is too long" 2013-06-14 08:59:23 +00:00
Jean Chalard
8385f1c622 Fix a bug where a user dict entry is too long 
Since there is a maxLength attribute to the text field, if the
requested entry is too long for the text field it will be truncated,
then setSelection will crash with an IOOB exception.

Bug: 9410958
Change-Id: I7e916b4d77d338f49db7d3dab4e536d27ec76bc1
 2013-06-14 13:10:07 +09:00
Baligh Uddin
8c2f42e7dd Merge "Import translations. DO NOT MERGE" 2013-06-13 16:01:53 +00:00
The Android Open Source Project
93420eeb38 am bb3a943d: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit 'bb3a943d1bd9cb8f7cca76850d432cfb2a6307e1':
 2013-06-13 08:25:38 -07:00
The Android Open Source Project
bb3a943d1b Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: Id19d096814424b1c1253d633f9bc0e18d53dc360
 2013-06-13 08:22:53 -07:00
The Android Automerger
8720f867c4 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-13 05:55:31 -07:00
The Android Open Source Project
ff8fbf0956 am a5520e76: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit 'a5520e76911421956c7c4fe4e28ac60c64a276b9':
  Import translations. DO NOT MERGE
 2013-06-12 18:10:13 -07:00
The Android Open Source Project
a5520e7691 Reconcile with jb-mr2-release - do not merge 
Change-Id: I5a23b290d9a03dbae2ac2cbb7bcdebe84a773c55
 2013-06-12 18:04:45 -07:00
Baligh Uddin
af442496a9 Import translations. DO NOT MERGE 
Change-Id: I5b53d1be101da33a7aaa664eccf887e0b17c0b97
Auto-generated-cl: translation import
 2013-06-12 14:32:13 -07:00
Baligh Uddin
bdd91eab59 am b45bac74: (-s ours) am 0117cc7c: Import translations. DO NOT MERGE 
* commit 'b45bac74e9b6e25d131e894c7b98f899f0adf122':
  Import translations. DO NOT MERGE
 2013-06-12 14:30:13 -07:00
Baligh Uddin
b45bac74e9 am 0117cc7c: Import translations. DO NOT MERGE 
* commit '0117cc7ce562569d32fc18341111100068d11eff':
  Import translations. DO NOT MERGE
 2013-06-12 13:22:08 -07:00
Baligh Uddin
c3269ec2b0 Import translations. DO NOT MERGE 
Change-Id: Ib20c522937dfe8b4534c108832f2c04f3115c546
Auto-generated-cl: translation import
 2013-06-12 12:55:00 -07:00
Baligh Uddin
0117cc7ce5 Import translations. DO NOT MERGE 
Change-Id: I5b53d1be101da33a7aaa664eccf887e0b17c0b97
Auto-generated-cl: translation import
 2013-06-12 12:51:36 -07:00
Amith Yamasani
7b5aa58de8 Merge "Don't show tether settings in shortcut picker" 2013-06-11 18:28:04 +00:00
Amith Yamasani
394eaa21e7 Don't show tether settings in shortcut picker 
On devices that don't have tethering options, don't allow user
to create a shortcut to the tether settings.

Bug: 6865610
Change-Id: I2ebbd6ef98391ef3fe74130570bd9b70108a2aa9
 2013-06-11 11:16:10 -07:00
Vinit Deshapnde
343bc6176e Merge "Fix an NPE in WifiP2pSettings UI" 2013-06-11 17:45:54 +00:00
Amith Yamasani
6cc92aff1c Merge "Remove Battery settings if battery is not present" 2013-06-11 17:10:50 +00:00
Baligh Uddin
022b68b042 Merge "Import translations. DO NOT MERGE" 2013-06-11 15:42:54 +00:00
Vinit Deshapnde
1a9819df16 Fix an NPE in WifiP2pSettings UI 
The NPE happens becase we save a references to the group that is to be
deleted, when the confirmation dialog is being shown to the user. We lose
that reference if orientation is changed (because the UI creates a new
WifiP2pSettings to interact with).

The fix is to save the name of the group that is being deleted in
persistent store, and re-select the group based on that.

Bug: 9004915
Change-Id: I1387a5b17fa2773748f4c8b34adddfc9516cfcf3
 2013-06-10 12:28:48 -07:00
The Android Open Source Project
ee53d98c93 am 302bd5c7: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
* commit '302bd5c78a860081ce63d7faba9b20c7d9af4092':
  Don't show ApnEditor as a dialog
  Import translations. DO NOT MERGE
  Allow hidden apps to opt-out
  resolved conflicts for merge of 5d21820a to jb-mr2-dev
  Fix issue #9074296: Device Admins can activate in a way...
  Ensure all active Device Admins are listed.
 2013-06-10 11:11:50 -07:00
Baligh Uddin
60a497d16b Import translations. DO NOT MERGE 
Change-Id: I29a30e6c327e84cb2f41a123a168baf6906e577b
Auto-generated-cl: translation import
 2013-06-10 10:06:42 -07:00
The Android Open Source Project
302bd5c78a Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
Change-Id: I7d22fa6b33c4e77725ae40de89fa6d83be4e8551
 2013-06-10 08:14:09 -07:00
The Android Automerger
fb4f46893e merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-09 05:55:49 -07:00
Amith Yamasani
310f94e79f Don't show ApnEditor as a dialog 
Else it would be missing the menu buttons.

Bug: 7328535
Change-Id: I8e30eec0b3d23dadd9ab6f1efbaa185fe1b6b431
 2013-06-07 15:32:20 -07:00
Baligh Uddin
8b5e2f4267 Import translations. DO NOT MERGE 
Change-Id: I4278f061c26bccc1713791f43a3cd81d69268d36
Auto-generated-cl: translation import
 2013-06-07 15:32:13 -07:00
Amith Yamasani
e108d69251 Allow hidden apps to opt-out 
When a system app doesn't have any UI, it wasn't being considered for
opt-out. Check for all system apps that want to opt-out and mark them
for uninstallation.

Bug: 8908632
Change-Id: Iad7ccbe544cc7c7ebf73f430fbab8d295eb40219
 2013-06-07 15:32:04 -07:00
Alex Klyubin
8059e00767 resolved conflicts for merge of 5d21820a to jb-mr2-dev 
Change-Id: If371a4571c5440ce2a0b4339f97893bf78832b31
 2013-06-07 15:31:11 -07:00
Dianne Hackborn
14e26fe7c9 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
 2013-06-07 15:30:38 -07:00
Alex Klyubin
bc63004cbf Ensure all active Device Admins are listed. 
Bug: 9074296
Change-Id: Ifb70c12ccea6628042b98a18186816887cb4477b
 2013-06-07 15:29:18 -07:00
Amith Yamasani
03a9fb6723 am 29294d84: am f3e827e8: Merge "Don\'t show ApnEditor as a dialog" into jb-mr2-dev 
* commit '29294d8408c3a754ea118160d29931e5646a5e1a':
  Don't show ApnEditor as a dialog
 2013-06-07 14:57:38 -07:00
Amith Yamasani
29294d8408 am f3e827e8: Merge "Don\'t show ApnEditor as a dialog" into jb-mr2-dev 
* commit 'f3e827e83da8d6aa70850c85bbe87d2f9feb82b1':
  Don't show ApnEditor as a dialog
 2013-06-07 14:55:09 -07:00
Amith Yamasani
f3e827e83d Merge "Don't show ApnEditor as a dialog" into jb-mr2-dev 2013-06-07 21:53:15 +00:00
Baligh Uddin
45d7fd85a2 am e84b20ba: (-s ours) am 2db8ca13: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'e84b20ba2ff70fd4eff8d213dc9f89f1f57f15c1':
  Import translations. DO NOT MERGE
 2013-06-07 12:25:52 -07:00
Baligh Uddin
e84b20ba2f am 2db8ca13: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '2db8ca13a781be5489df614a5513240493edaeed':
  Import translations. DO NOT MERGE
 2013-06-07 12:23:44 -07:00
Chong Zhang
02717449e6 Merge "wifi-display: change string to "In use" instead of "Busy"" 2013-06-07 19:20:16 +00:00
Baligh Uddin
2db8ca13a7 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-06-07 19:19:41 +00:00
Amith Yamasani
47d8a5f13b am 893bdcd5: am 1b79c5c8: Merge "Allow hidden apps to opt-out" into jb-mr2-dev 
* commit '893bdcd5312f314da7925f22345cb4efe0e1c442':
  Allow hidden apps to opt-out
 2013-06-07 10:49:23 -07:00
Amith Yamasani
893bdcd531 am 1b79c5c8: Merge "Allow hidden apps to opt-out" into jb-mr2-dev 
* commit '1b79c5c804e53fc63f602a5c4dcd876a0d2c7ab9':
  Allow hidden apps to opt-out
 2013-06-07 10:47:24 -07:00
Amith Yamasani
1b79c5c804 Merge "Allow hidden apps to opt-out" into jb-mr2-dev 2013-06-07 17:45:26 +00:00
Chong Zhang
5e1367f63a wifi-display: change string to "In use" instead of "Busy" 
Bug 9229799

Change-Id: Id87987812e3d65ef2a2196668f5d67b4417368d3
 2013-06-07 10:29:34 -07:00
Amith Yamasani
34bd7e68db Don't show ApnEditor as a dialog 
Else it would be missing the menu buttons.

Bug: 7328535
Change-Id: I8e30eec0b3d23dadd9ab6f1efbaa185fe1b6b431
 2013-06-07 10:19:55 -07:00