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

15909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Lawrence
1f06a89f46 Merge "Get correct factory reset reason from encryption failure" into lmp-dev 2014-09-02 19:33:25 +00:00
Maurice Lam
e3b7f5aa5e am 3b609ffb: am def48d60: Merge "[WifiSetup] Add shadow below header" into lmp-dev 
* commit '3b609ffb91238beadda2a7edf4ab1b575aa9d3bd':
  [WifiSetup] Add shadow below header
 2014-09-02 19:18:45 +00:00
Maurice Lam
3b609ffb91 am def48d60: Merge "[WifiSetup] Add shadow below header" into lmp-dev 
* commit 'def48d605abe4fe597dbcea5e7c2f9ca93f1b237':
  [WifiSetup] Add shadow below header
 2014-09-02 19:03:00 +00:00
Maurice Lam
def48d605a Merge "[WifiSetup] Add shadow below header" into lmp-dev 2014-09-02 18:51:36 +00:00
PauloftheWest
00a0f7351a am de6af9c2: am bde55601: Merge "Fixed a Null Pointer Exception when Wifi Settings is indexing." into lmp-dev 
* commit 'de6af9c2876c6a42cef7f34b95896f4ddf650d8a':
  Fixed a Null Pointer Exception when Wifi Settings is indexing.
 2014-09-02 18:44:09 +00:00
PauloftheWest
de6af9c287 am bde55601: Merge "Fixed a Null Pointer Exception when Wifi Settings is indexing." into lmp-dev 
* commit 'bde55601ba5695894b7f9b8c7f61fd6694f9b459':
  Fixed a Null Pointer Exception when Wifi Settings is indexing.
 2014-09-02 18:28:54 +00:00
Paul Lawrence
87abbd3ea0 Get correct factory reset reason from encryption failure 
Requires matching framework change
https://googleplex-android-review.git.corp.google.com/#/c/535832/

Bug: 17213613
Change-Id: Ia8006f4a9cb5909d83f1848d9acfbc3f1e0ab5fb
 2014-09-02 18:26:38 +00:00
PauloftheWest
bde55601ba Merge "Fixed a Null Pointer Exception when Wifi Settings is indexing." into lmp-dev 2014-09-02 18:11:38 +00:00
Fabrice Di Meglio
1ef630938f am 1aaa801e: am de8c683f: Merge "Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)" into lmp-dev 
* commit '1aaa801e963352513a9ffa8c51a234c8bc69c30e':
  Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)
 2014-09-02 17:35:49 +00:00
Fabrice Di Meglio
1aaa801e96 am de8c683f: Merge "Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)" into lmp-dev 
* commit 'de8c683f99b8db7289289016cf5d33016eea9dcd':
  Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)
 2014-09-02 17:22:54 +00:00
Fabrice Di Meglio
de8c683f99 Merge "Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)" into lmp-dev 2014-09-02 17:13:42 +00:00
Dan Sandler
62927c0f44 am eee4ba73: am 3eac072b: Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev 
* commit 'eee4ba73d23d07f6edb176b341e85716c4989155':
  Switch to vibrate (or slash-bell) icon at ringer volume 0.
 2014-09-02 15:52:10 +00:00
Dan Sandler
eee4ba73d2 am 3eac072b: Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev 
* commit '3eac072b1ad963007211d1b13ebb6d0bb0fc24a6':
  Switch to vibrate (or slash-bell) icon at ringer volume 0.
 2014-09-02 15:40:18 +00:00
Dan Sandler
3eac072b1a Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev 2014-09-02 15:32:41 +00:00
PauloftheWest
125bf2375e Fixed a Null Pointer Exception when Wifi Settings is indexing. 
Bug: 17335468
Change-Id: I85293e882d90da4a54d4690ffec32fba7101b65e
 2014-09-02 06:52:01 -07:00
PauloftheWest
367c4c5141 am b4460ad4: am d6cfeba9: Merge "Updated Wifi Assistant to support RTL." into lmp-dev 
* commit 'b4460ad4e6167ea2d173ccf68512568542f4b2b8':
  Updated Wifi Assistant to support RTL.
 2014-09-02 13:18:03 +00:00
PauloftheWest
b4460ad4e6 am d6cfeba9: Merge "Updated Wifi Assistant to support RTL." into lmp-dev 
* commit 'd6cfeba9f717fe043efc56d4bdf18a18e4bb9bff':
  Updated Wifi Assistant to support RTL.
 2014-09-02 13:12:01 +00:00
PauloftheWest
d6cfeba9f7 Merge "Updated Wifi Assistant to support RTL." into lmp-dev 2014-09-02 13:00:32 +00:00
Dan Sandler
cb9f35171d Switch to vibrate (or slash-bell) icon at ringer volume 0. 
Bug: 16900054
Change-Id: If94a18a7cac596c0f4c33421b642f96dcf0280fd
 2014-09-02 12:48:51 +02:00
Baligh Uddin
df2e93ae45 am c5d70052: (-s ours) am 48d3f0fd: (-s ours) Import translations. DO NOT MERGE 
* commit 'c5d70052951a43e876a2c9a2a863bf5008de2324':
  Import translations. DO NOT MERGE
 2014-09-01 21:51:43 +00:00
Baligh Uddin
c5d7005295 am 48d3f0fd: (-s ours) Import translations. DO NOT MERGE 
* commit '48d3f0fd612b740f92fc1c268c27eb9e55a2ef68':
  Import translations. DO NOT MERGE
 2014-09-01 21:44:29 +00:00
Baligh Uddin
48d3f0fd61 Import translations. DO NOT MERGE 
Change-Id: Icb08251fbb0bc518bde18c174fedf464b0635486
Auto-generated-cl: translation import
 2014-08-31 22:40:04 -07:00
Fabrice Di Meglio
72e07cf21c Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518) 
- do not care about getting a result for updating the Index as
there is no way to make it useful (the result will come later
when this is no more relevant)
- make a copy of the data to process and pass it to the AsyncTask

Change-Id: I6b8a08ecbe3d32cffac1314c03f682ebacfd64bf
 2014-08-29 17:44:52 -07:00
Maurice Lam
d531a08702 [WifiSetup] Add shadow below header 
Added shadow for phone portrait and landscape layouts

Bug: 17136887
Change-Id: I65dc01d7387812681bbc99d5cc9440714a72ff60
 2014-08-29 15:17:42 -07:00
Vinit Deshpande
e0441cfc07 Address API Council feedback for WifiAdapter/WPS APIs 
This change addresses concerns from the API review. Things that
are fixed are -

1. WifiAdapter is removed, until we have 'real' support for it
2. All the methods from WifiAdapter are moved to WifiManager
3. Changed WPSListener API names to be onFailed/onSucceeded et al
4. Removed ActionListener from WPS APIs, they now take WpsListener

Bug: 16403303
Bug: 17115004
Change-Id: I609c42f08b52f77240ce9a97b1a9941a9c154752
 2014-08-29 14:17:19 -07:00
Chris Wren
16b5484af1 am 0ee29ed7: am 8007caa4: Merge "Allow external packages to open the RedactionInsterstitial." into lmp-dev 
* commit '0ee29ed7c2082aea8dae71e5a2d76376c7683f0f':
  Allow external packages to open the RedactionInsterstitial.
 2014-08-29 21:11:22 +00:00
Chris Wren
0ee29ed7c2 am 8007caa4: Merge "Allow external packages to open the RedactionInsterstitial." into lmp-dev 
* commit '8007caa43e0a97bc8b160544b81c3b6902cc37f3':
  Allow external packages to open the RedactionInsterstitial.
 2014-08-29 21:03:03 +00:00
Chris Wren
8007caa43e Merge "Allow external packages to open the RedactionInsterstitial." into lmp-dev 2014-08-29 20:51:00 +00:00
Chris Wren
c5e553f23f am edcfcef0: am a826cb52: Merge "default to lock_screen_notifications_summary_show." into lmp-dev 
* commit 'edcfcef00c4a0749557fe1c01c503fe5db68674e':
  default to lock_screen_notifications_summary_show.
 2014-08-29 20:23:43 +00:00
Chris Wren
05fa2d44b3 am 577f56d7: am 0680e0e7: Merge "Don\'t allow users to set redaction on an insecure device." into lmp-dev 
* commit '577f56d7414e2cba3231685393e89b526c85bb62':
  Don't allow users to set redaction on an insecure device.
 2014-08-29 20:23:42 +00:00
Andres Morales
6afc60d100 am 7228243b: am ab61b0df: Throw up ProgressDialog when erasing PST partition 
* commit '7228243bd3a52ced50dbf6d4e4611cbdf1315795':
  Throw up ProgressDialog when erasing PST partition
 2014-08-29 20:23:41 +00:00
Chris Wren
edcfcef00c am a826cb52: Merge "default to lock_screen_notifications_summary_show." into lmp-dev 
* commit 'a826cb523f10efde7b1a68ba1b172777c34529fb':
  default to lock_screen_notifications_summary_show.
 2014-08-29 20:12:04 +00:00
Chris Wren
577f56d741 am 0680e0e7: Merge "Don\'t allow users to set redaction on an insecure device." into lmp-dev 
* commit '0680e0e7cd9ba8ac9c01c85a1ed8b75d95a30b6b':
  Don't allow users to set redaction on an insecure device.
 2014-08-29 20:12:03 +00:00
Andres Morales
7228243bd3 am ab61b0df: Throw up ProgressDialog when erasing PST partition 
* commit 'ab61b0df4af1a504e845c7008224ebadb5400ce9':
  Throw up ProgressDialog when erasing PST partition
 2014-08-29 20:12:02 +00:00
Chris Wren
a826cb523f Merge "default to lock_screen_notifications_summary_show." into lmp-dev 2014-08-29 20:08:38 +00:00
Chris Wren
0680e0e7cd Merge "Don't allow users to set redaction on an insecure device." into lmp-dev 2014-08-29 20:07:44 +00:00
Andres Morales
ab61b0df4a Throw up ProgressDialog when erasing PST partition 
This needs to be done here, but we should let the user know
we're doing work.

Bug: 17185720
Change-Id: I0d71ae38145e0649a430a8231b7e3f250c003ee8
 2014-08-29 12:46:18 -07:00
Chris Wren
51ae332c3b Allow external packages to open the RedactionInsterstitial. 
Introduce RedactionSettingsStandalone, to supply the private setup
required by RedactionInsterstitial.

Bug: 15934899
Change-Id: Ie0bcc207c4f331def207e588bbad36b8986fe114
 2014-08-29 15:17:37 -04:00
Chris Wren
30698293bf default to lock_screen_notifications_summary_show. 
When the user selects a secure unlock method for the first time,
default to 'Show all notification content'.

Bug: 17010183
Change-Id: I4953e2b1e605bf6f13240ef0483a37265263ea8d
 2014-08-29 15:17:37 -04:00
Chris Wren
f48249a3b8 Don't allow users to set redaction on an insecure device. 
Bug: 17106788
Change-Id: I05f8f4d920158fe99186fb8b879278d6780b8722
 2014-08-29 15:17:36 -04:00
Maurice Lam
183cbcba2f am 63a6b46a: am 8dade422: Merge "[WifiSetup] Workaround for accessibility in landscape" into lmp-dev 
* commit '63a6b46aacca7e0a02a01f42617a1d17c24478d8':
  [WifiSetup] Workaround for accessibility in landscape
 2014-08-29 18:48:18 +00:00
Maurice Lam
63a6b46aac am 8dade422: Merge "[WifiSetup] Workaround for accessibility in landscape" into lmp-dev 
* commit '8dade422e50a6bc0916f95ab42cf0e128ff42046':
  [WifiSetup] Workaround for accessibility in landscape
 2014-08-29 03:36:55 +00:00
Maurice Lam
8dade422e5 Merge "[WifiSetup] Workaround for accessibility in landscape" into lmp-dev 2014-08-29 01:55:09 +00:00
Maurice Lam
182c239730 [WifiSetup] Workaround for accessibility in landscape 
This change works around a bug that TalkBack doesn't work and keep
throwing out error logs in landscape mode.

Bug: 17320180
Change-Id: I952e8f828b6c7d67a7adfa0cb710e73a7e2864f1
 2014-08-28 18:21:52 -07:00
Diego Pontoriero
a6e7e4d55a am ede4c009: am 88e5901e: Merge "Change TelephonyManager method name to accurately reflect functionality." into lmp-dev 
* commit 'ede4c009d6da0fb8f5e2076f62a03ab73a067707':
  Change TelephonyManager method name to accurately reflect functionality.
 2014-08-28 23:02:25 +00:00
Selim Gurun
8cb90f4015 am a8028968: am d578fc00: Merge "Use GoogleSetting to override DRP setting if available" into lmp-dev 
* commit 'a80289680d4badf3039c7e83dea7b9545363dbe5':
  Use GoogleSetting to override DRP setting if available
 2014-08-28 23:02:24 +00:00
Diego Pontoriero
ede4c009d6 am 88e5901e: Merge "Change TelephonyManager method name to accurately reflect functionality." into lmp-dev 
* commit '88e5901e58d69cdc9f59352fe3a672ed4ec39294':
  Change TelephonyManager method name to accurately reflect functionality.
 2014-08-28 22:48:45 +00:00
Selim Gurun
a80289680d am d578fc00: Merge "Use GoogleSetting to override DRP setting if available" into lmp-dev 
* commit 'd578fc00b57c5d8d7122bb25d122e24779669fdb':
  Use GoogleSetting to override DRP setting if available
 2014-08-28 22:48:44 +00:00
Diego Pontoriero
88e5901e58 Merge "Change TelephonyManager method name to accurately reflect functionality." into lmp-dev 2014-08-28 22:38:47 +00:00
Selim Gurun
d578fc00b5 Merge "Use GoogleSetting to override DRP setting if available" into lmp-dev 2014-08-28 22:11:46 +00:00