Commit Graph

15931 Commits

Author SHA1 Message Date
Amith Yamasani
92c5452f08 Change the location mode before applying restrictions
Once the location sharing restriction is applied, the setting cannot
be changed, so change the setting first.

Bug: 17348894
Change-Id: I9dcad230e816aaa2482f1f35f1993f51d14eabc7
2014-09-02 17:48:31 -07:00
PauloftheWest
43454701c6 am ebe496ea: Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev
* commit 'ebe496ea7b18c5d702db4beee270046e43e491ad':
  Fixed a crash when loading Bluetooth Settings.
2014-09-02 21:38:49 +00:00
PauloftheWest
5029b7a90c am ebe496ea: Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev
* commit 'ebe496ea7b18c5d702db4beee270046e43e491ad':
  Fixed a crash when loading Bluetooth Settings.
2014-09-02 21:38:29 +00:00
PauloftheWest
ebe496ea7b Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev 2014-09-02 21:31:23 +00:00
PauloftheWest
dba078fe86 Fixed a crash when loading Bluetooth Settings.
Bug: 17320674
Change-Id: Ibff0b5929b88b1a48c1fdd810fd8461bdb5f1274
2014-09-02 14:24:38 -07:00
Jason Monk
797f3c4853 am 8069392f: am dc4818ab: Merge "Bring back auto-rotate to settings" into lmp-dev
* commit '8069392f8e0aecaa028eb0b90376a210cab028fe':
  Bring back auto-rotate to settings
2014-09-02 20:25:57 +00:00
Jason Monk
c8d9504eea am dc4818ab: Merge "Bring back auto-rotate to settings" into lmp-dev
* commit 'dc4818ab7aa959143a1eb0b88bf0a4c9e6d19380':
  Bring back auto-rotate to settings
2014-09-02 20:14:20 +00:00
Jason Monk
8069392f8e am dc4818ab: Merge "Bring back auto-rotate to settings" into lmp-dev
* commit 'dc4818ab7aa959143a1eb0b88bf0a4c9e6d19380':
  Bring back auto-rotate to settings
2014-09-02 20:14:09 +00:00
Jason Monk
dc4818ab7a Merge "Bring back auto-rotate to settings" into lmp-dev 2014-09-02 20:04:35 +00:00
Paul Lawrence
23eeb0996f am bde3efa0: am 1f06a89f: Merge "Get correct factory reset reason from encryption failure" into lmp-dev
* commit 'bde3efa0617f458fa86c3adbdd8e75956872eccf':
  Get correct factory reset reason from encryption failure
2014-09-02 19:54:19 +00:00
Jason Monk
d3232da75a Bring back auto-rotate to settings
Add a dropdown preference to the display settings screen that
controls whether auto-rotate is on.

Bug: 16636008
Change-Id: I71099a23793aa82b514bd0eebae183695415a92c
2014-09-02 15:46:08 -04:00
Paul Lawrence
bde3efa061 am 1f06a89f: Merge "Get correct factory reset reason from encryption failure" into lmp-dev
* commit '1f06a89f468d7998a271b49dfbbdd7ea1f5b01a3':
  Get correct factory reset reason from encryption failure
2014-09-02 19:46:00 +00:00
Paul Lawrence
8826a64a6c am 1f06a89f: Merge "Get correct factory reset reason from encryption failure" into lmp-dev
* commit '1f06a89f468d7998a271b49dfbbdd7ea1f5b01a3':
  Get correct factory reset reason from encryption failure
2014-09-02 19:44:56 +00:00
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
8efe92789e am def48d60: Merge "[WifiSetup] Add shadow below header" into lmp-dev
* commit 'def48d605abe4fe597dbcea5e7c2f9ca93f1b237':
  [WifiSetup] Add shadow below header
2014-09-02 19:01:46 +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
PauloftheWest
9fef5db88e 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:27:20 +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
8bde623e65 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:21:58 +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
c8c5091f26 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:13 +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
a8d4b00508 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
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
25728d220a am 48d3f0fd: (-s ours) Import translations. DO NOT MERGE
* commit '48d3f0fd612b740f92fc1c268c27eb9e55a2ef68':
  Import translations. DO NOT MERGE
2014-09-01 21:43:55 +00:00
Baligh Uddin
d7697f0f11 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-01 21:31:29 +00:00
Baligh Uddin
9ee2bffcc6 Import translations. DO NOT MERGE
Change-Id: Ia06570df1e52b2dd91ac4dda2f56bb2d2f4333de
Auto-generated-cl: translation import
2014-08-31 22:43:19 -07: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
Wink Saville
983658696b ksd to lmp-sprout-dev
Change-Id: I94eb65c62231b5831570bb0cbbbd9c916bee0a37
2014-08-31 19:21:02 -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