PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,507 Commits 1 Branch 0 Tags
2ea6bb355fe8fd4e61d9e7c3e853066b1082f850
Commit Graph

15507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
2ea6bb355f am 9d20b0c0: am eb0d3b7c: am fad2b09d: Merge "Disable disable button according to user restrictions." into lmp-dev 
* commit '9d20b0c089e7b65bc56f90b23fec909b98dbd4f7':
  Disable disable button according to user restrictions.
 2014-08-15 21:26:55 +00:00
Julia Reynolds
9d20b0c089 am eb0d3b7c: am fad2b09d: Merge "Disable disable button according to user restrictions." into lmp-dev 
* commit 'eb0d3b7cd02ac8d89b52d26f495ade11bc85c364':
  Disable disable button according to user restrictions.
 2014-08-15 21:16:59 +00:00
Fabrice Di Meglio
b67a3c59ee am 1c6d5406: am 1b1f3d59: am 0ff107e3: Merge "Fix bug #16703191 APN settings shows back button even when you intent into it" into lmp-dev 
* commit '1c6d54064643e5648b58892ef0d92ce9be9fdb53':
  Fix bug #16703191 APN settings shows back button even when you intent into it
 2014-08-15 21:11:08 +00:00
Fabrice Di Meglio
1c6d540646 am 1b1f3d59: am 0ff107e3: Merge "Fix bug #16703191 APN settings shows back button even when you intent into it" into lmp-dev 
* commit '1b1f3d5949a68967e5cc405d5aed1c357ecb0aa0':
  Fix bug #16703191 APN settings shows back button even when you intent into it
 2014-08-15 20:59:21 +00:00
Julia Reynolds
eb0d3b7cd0 am fad2b09d: Merge "Disable disable button according to user restrictions." into lmp-dev 
* commit 'fad2b09db8cf65478db35f9a8265c948ccffeabc':
  Disable disable button according to user restrictions.
 2014-08-15 20:23:20 +00:00
Julia Reynolds
fad2b09db8 Merge "Disable disable button according to user restrictions." into lmp-dev 2014-08-15 19:14:43 +00:00
Fabrice Di Meglio
1b1f3d5949 am 0ff107e3: Merge "Fix bug #16703191 APN settings shows back button even when you intent into it" into lmp-dev 
* commit '0ff107e384a6fe99bfa8a5e542f6e0c89b909d85':
  Fix bug #16703191 APN settings shows back button even when you intent into it
 2014-08-15 18:46:56 +00:00
John Spurlock
14f025bc31 am 95ab4a53: am 9c979df2: am a7f8addd: Settings: Update to follow NotificationManager aidl change. 
* commit '95ab4a537f2537e0ded2329a6bb5cfed82062595':
  Settings: Update to follow NotificationManager aidl change.
 2014-08-15 15:28:10 +00:00
John Spurlock
95ab4a537f am 9c979df2: am a7f8addd: Settings: Update to follow NotificationManager aidl change. 
* commit '9c979df2d6a768e909b546dc198f005c17ebeeab':
  Settings: Update to follow NotificationManager aidl change.
 2014-08-15 15:21:49 +00:00
John Spurlock
9c979df2d6 am a7f8addd: Settings: Update to follow NotificationManager aidl change. 
* commit 'a7f8addd0982f599105aeb9611477b149860db83':
  Settings: Update to follow NotificationManager aidl change.
 2014-08-15 15:16:15 +00:00
John Spurlock
a7f8addd09 Settings: Update to follow NotificationManager aidl change. 
Depends on frameworks/base:
  I1d8269a4e6fe170ce776bf932dbbdfb29dd25dd7

Change-Id: I4015b60d84541a1f3d9e9c506ab8f44f1d18f71f
 2014-08-15 15:06:43 +00:00
Baligh Uddin
a065c3e8f1 am 5173ab28: (-s ours) am e403e32a: (-s ours) am 86370f5d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '5173ab28026d59eb672cf6a416fde4ed20704d02':
  Import translations. DO NOT MERGE
 2014-08-15 13:37:50 +00:00
Maurice Lam
2a118af91b am a604bf23: am 2d57c470: am 3d8dd19c: Merge "[WifiSetup] Update illustrations" into lmp-dev 
* commit 'a604bf238597114b28d937f7db4ab34d71c6fd38':
  [WifiSetup] Update illustrations
 2014-08-15 13:37:48 +00:00
Jim Miller
6b42451e41 am 23174fc8: am adf93411: am bbce34d9: Merge "API review - move confirm credential constants from Intent" into lmp-dev 
* commit '23174fc812bed9684cda089ff2fe53aa632589ad':
  API review - move confirm credential constants from Intent
 2014-08-15 13:37:47 +00:00
Selim Gurun
d998626853 am ce0f0078: am 63b671c8: am ce8d3910: Remove logic to read the key from GServices 
* commit 'ce0f0078641331b6ba8f4c900f95bfbb319a7054':
  Remove logic to read the key from GServices
 2014-08-15 13:37:46 +00:00
Baligh Uddin
5173ab2802 am e403e32a: (-s ours) am 86370f5d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e403e32afbfb2db4fcbb32819d7323a8374ed5f8':
  Import translations. DO NOT MERGE
 2014-08-15 11:50:34 +00:00
Maurice Lam
a604bf2385 am 2d57c470: am 3d8dd19c: Merge "[WifiSetup] Update illustrations" into lmp-dev 
* commit '2d57c4705d73f37e0c7c1b96cc9e1288e4c17306':
  [WifiSetup] Update illustrations
 2014-08-15 11:50:00 +00:00
Jim Miller
23174fc812 am adf93411: am bbce34d9: Merge "API review - move confirm credential constants from Intent" into lmp-dev 
* commit 'adf9341125fac14aef7beb272f6371a6aafb4aa3':
  API review - move confirm credential constants from Intent
 2014-08-15 11:49:21 +00:00
Selim Gurun
ce0f007864 am 63b671c8: am ce8d3910: Remove logic to read the key from GServices 
* commit '63b671c84b48703bbc2d554fa378b8c1e853e19c':
  Remove logic to read the key from GServices
 2014-08-15 11:48:32 +00:00
arete
0034c9047b am 4db6a46e: am f1fd6937: am 17224826: Cannot cancel in the "Warn app installation" dialog in security settings. 
* commit '4db6a46ef8f7d2d28a798e8ba12de0a54d6fc2b1':
  Cannot cancel in the "Warn app installation" dialog in security settings.
 2014-08-15 11:42:43 +00:00
Adam Powell
570334eda9 am 872e9575: am 7660042f: am aa772c95: Merge "Use material alert dialog item view layout" into lmp-dev 
* commit '872e9575160c02e80e809a2c3a1b931bd2ede445':
  Use material alert dialog item view layout
 2014-08-15 11:42:42 +00:00
arete
8208b42db7 am b2bc75dc: am 943a1877: am ce543836: Change checkboxes to switches in "Settings->Backup&Reset" 
* commit 'b2bc75dc50d9eb41e6f6a44c0292c6f7c8a7ed1a':
  Change checkboxes to switches in "Settings->Backup&Reset"
 2014-08-15 11:42:41 +00:00
Fabrice Di Meglio
7a81dab5b6 am 737fc5ec: am 0147d813: am d83b3c2a: Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment@273c8fdb was not registered 
* commit '737fc5ec9e7509a5336be601674a1c3590c86ca8':
  Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment$1@273c8fdb was not registered
 2014-08-15 11:42:40 +00:00
arete
4db6a46ef8 am f1fd6937: am 17224826: Cannot cancel in the "Warn app installation" dialog in security settings. 
* commit 'f1fd693751d73b51e5cdf6a71dccca3884ee125f':
  Cannot cancel in the "Warn app installation" dialog in security settings.
 2014-08-15 11:36:57 +00:00
Adam Powell
872e957516 am 7660042f: am aa772c95: Merge "Use material alert dialog item view layout" into lmp-dev 
* commit '7660042fa2f5423b9e5d156db0d063e9ffed0fe3':
  Use material alert dialog item view layout
 2014-08-15 11:35:36 +00:00
arete
b2bc75dc50 am 943a1877: am ce543836: Change checkboxes to switches in "Settings->Backup&Reset" 
* commit '943a1877e6636d6986eadbf7d699356b085c469e':
  Change checkboxes to switches in "Settings->Backup&Reset"
 2014-08-15 11:35:30 +00:00
Fabrice Di Meglio
737fc5ec9e am 0147d813: am d83b3c2a: Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment@273c8fdb was not registered 
* commit '0147d813edb6befc8a1728accc54a70ebcc6bc3d':
  Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment$1@273c8fdb was not registered
 2014-08-15 11:33:21 +00:00
Baligh Uddin
e403e32afb am 86370f5d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '86370f5dfd3f78e80b9940c31d73975a46080964':
  Import translations. DO NOT MERGE
 2014-08-15 05:52:16 +00:00
Baligh Uddin
df8ee1bb6c Merge "Import translations. DO NOT MERGE" 2014-08-15 04:54:19 +00:00
Baligh Uddin
86370f5dfd Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-15 04:38:54 +00:00
Fabrice Di Meglio
0ff107e384 Merge "Fix bug #16703191 APN settings shows back button even when you intent into it" into lmp-dev 2014-08-15 04:37:53 +00:00
Fabrice Di Meglio
61a1fec49f Fix bug #16703191 APN settings shows back button even when you intent into it 
- change a bit the way we recognize a SubSetting. Now we can pass the new
":settings:show_fragment_as_subsetting" Intent extra for forcing it.
- convert ApnSettings to a SettingsPreferenceFragment

Change-Id: I22167ad317530c0a58c4d522a72826f9d34ad2d3
 2014-08-15 11:36:31 -07:00
Maurice Lam
2d57c4705d am 3d8dd19c: Merge "[WifiSetup] Update illustrations" into lmp-dev 
* commit '3d8dd19c85ca94e647245a70df9ca6a9c039b7de':
  [WifiSetup] Update illustrations
 2014-08-15 02:55:34 +00:00
Jim Miller
adf9341125 am bbce34d9: Merge "API review - move confirm credential constants from Intent" into lmp-dev 
* commit 'bbce34d9be421effb055fbf1a945ec49dfeef02d':
  API review - move confirm credential constants from Intent
 2014-08-15 01:37:29 +00:00
Selim Gurun
63b671c84b am ce8d3910: Remove logic to read the key from GServices 
* commit 'ce8d39103f51eb418cad61ee3e0a80445307e46a':
  Remove logic to read the key from GServices
 2014-08-15 00:08:38 +00:00
PauloftheWest
1cff659ed7 am 8542d9d2: am fd002cf0: am 841f760f: Merge "Fixed a bug were secure Wi-Fi connections would show unsecured." into lmp-dev 
* commit '8542d9d27f1e4c51227f71ce1997776f2b4a4114':
  Fixed a bug were secure Wi-Fi connections would show unsecured.
 2014-08-14 23:42:48 +00:00
Zoltan Szatmary-Ban
afa437f3cc am 308bad0e: am 327a50e5: am 3aaf0eb4: Fix app icons on some Settings screens 
* commit '308bad0e169753b821a5f411f1eb5562767fa3f7':
  Fix app icons on some Settings screens
 2014-08-14 23:42:47 +00:00
PauloftheWest
8542d9d27f am fd002cf0: am 841f760f: Merge "Fixed a bug were secure Wi-Fi connections would show unsecured." into lmp-dev 
* commit 'fd002cf07972b29e4ad5980ec12891b7200b8e91':
  Fixed a bug were secure Wi-Fi connections would show unsecured.
 2014-08-14 23:34:44 +00:00
Zoltan Szatmary-Ban
308bad0e16 am 327a50e5: am 3aaf0eb4: Fix app icons on some Settings screens 
* commit '327a50e5c01eed62d86187457a206293fb199614':
  Fix app icons on some Settings screens
 2014-08-14 23:34:18 +00:00
Selim Gurun
ce8d39103f Remove logic to read the key from GServices 
Bug: 12492817

The key is now stored in webview apk so remove the logic
to read from GServices.

Change-Id: I9f9b57d59885d93023be307a80d5a7db143ffbfe
 2014-08-14 15:44:45 -07:00
arete
f1fd693751 am 17224826: Cannot cancel in the "Warn app installation" dialog in security settings. 
* commit '17224826f896278de0805e6a2fec321701bbb83d':
  Cannot cancel in the "Warn app installation" dialog in security settings.
 2014-08-14 21:52:22 +00:00
arete
17224826f8 Cannot cancel in the "Warn app installation" dialog in security settings. 
Bug: 16900059
Change-Id: Ie4e335b000350632bffc5740939b46b21357e298
 2014-08-14 21:45:04 +00:00
Adam Powell
7660042fa2 am aa772c95: Merge "Use material alert dialog item view layout" into lmp-dev 
* commit 'aa772c9521529d6235aa7be0fb81e75a334c4b82':
  Use material alert dialog item view layout
 2014-08-14 20:29:17 +00:00
arete
943a1877e6 am ce543836: Change checkboxes to switches in "Settings->Backup&Reset" 
* commit 'ce543836cea5887484026837f0a4181dca04a733':
  Change checkboxes to switches in "Settings->Backup&Reset"
 2014-08-14 20:24:39 +00:00
arete
ce543836ce Change checkboxes to switches in "Settings->Backup&Reset" 
Change-Id: I92b5d0051b717c66bc456a0864c3068b13112dd3

Bug: 16982604
 2014-08-14 19:57:50 +00:00
Zoltan Szatmary-Ban
5e853f5f0a am 70bd3004: am 7c236400: am f8be13d8: Merge "Remove spinner in Settings > VPN" into lmp-dev 
* commit '70bd30045277feecc95ee67b6a243f87071f1bb5':
  Remove spinner in Settings > VPN
 2014-08-14 18:10:06 +00:00
Fabrice Di Meglio
0147d813ed am d83b3c2a: Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment@273c8fdb was not registered 
* commit 'd83b3c2a39e4716b4a4276b8b8ce0db2b9a62b9e':
  Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment$1@273c8fdb was not registered
 2014-08-14 18:08:51 +00:00
Zoltan Szatmary-Ban
70bd300452 am 7c236400: am f8be13d8: Merge "Remove spinner in Settings > VPN" into lmp-dev 
* commit '7c2364005e18ebea6ed50a2156fd2b1a22e95c6f':
  Remove spinner in Settings > VPN
 2014-08-14 18:03:17 +00:00
Fabrice Di Meglio
d83b3c2a39 Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. 
SettingsPreferenceFragment$1@273c8fdb was not registered

- add override for onUnbindPreferences() that will unregister the observer
if needed
- keep track of the root adapter so that we can unregister / register with
the correct one (by having a new PreferenceScreen the root adapter would not
be the same and thus unregistering the Observer on the new one would not work
and create the current bug)

Change-Id: I2cef0398c2ae0ab4f5ffd67ca20e8874be997bf6
 2014-08-14 18:01:42 +00:00
Amith Yamasani
18511b32ed am 69400ffd: am c8eff56e: am e73b8ccf: Merge "Make sure profile owner is system app" into lmp-dev 
* commit '69400ffddc327a620abb49fc0ca3257288b9e3e6':
  Make sure profile owner is system app
 2014-08-14 17:55:38 +00:00