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
119d6ca99d
am e3b7f5aa
: am 3b609ffb
: am def48d60
: Merge "[WifiSetup] Add shadow below header" into lmp-dev
...
* commit 'e3b7f5aa5e750871f0b745c479ea8a3a3c570bfb':
[WifiSetup] Add shadow below header
2014-09-02 19:30:42 +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
PauloftheWest
25ee0b0317
am 00a0f735
: am de6af9c2
: am bde55601
: Merge "Fixed a Null Pointer Exception when Wifi Settings is indexing." into lmp-dev
...
* commit '00a0f7351af68a58dc27cba32feaeff982473d6b':
Fixed a Null Pointer Exception when Wifi Settings is indexing.
2014-09-02 18:55:44 +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
90d19eb154
am 1ef63093
: 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 '1ef630938f4989873f43e15e7c7eed18a2fb3af8':
Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)
2014-09-02 17:57:21 +00:00
Dan Sandler
ca15bbcf58
am 62927c0f
: am eee4ba73
: am 3eac072b
: Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev
...
* commit '62927c0f44186e7c46513b27c10abefd110b6d2a':
Switch to vibrate (or slash-bell) icon at ringer volume 0.
2014-09-02 17:44:18 +00:00
PauloftheWest
93b823dff7
am 367c4c51
: am b4460ad4
: am d6cfeba9
: Merge "Updated Wifi Assistant to support RTL." into lmp-dev
...
* commit '367c4c514152b511d6cf05c3b61c1ec96e84d7f5':
Updated Wifi Assistant to support RTL.
2014-09-02 17:44:11 +00:00
Baligh Uddin
c9a0edd9e0
am df2e93ae
: (-s ours) am c5d70052
: (-s ours) am 48d3f0fd
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'df2e93ae4519b1bf42b7e7629c2746c800314218':
Import translations. DO NOT MERGE
2014-09-02 17:39:46 +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
bcd3e3fd2c
Merge "Import translations. DO NOT MERGE"
2014-09-01 21:31:29 +00:00
Chris Wren
37f011bbe9
am 16b5484a
: am 0ee29ed7
: am 8007caa4
: Merge "Allow external packages to open the RedactionInsterstitial." into lmp-dev
...
* commit '16b5484af17685237de5ca65b80d2f7817935a36':
Allow external packages to open the RedactionInsterstitial.
2014-09-01 11:25:44 +00:00
Chris Wren
0f0db2d37a
am c5e553f2
: am edcfcef0
: am a826cb52
: Merge "default to lock_screen_notifications_summary_show." into lmp-dev
...
* commit 'c5e553f23f402aea539559d87a8a2acd6489f8af':
default to lock_screen_notifications_summary_show.
2014-09-01 11:25:34 +00:00
Chris Wren
cfbbc4cc97
am 05fa2d44
: am 577f56d7
: am 0680e0e7
: Merge "Don\'t allow users to set redaction on an insecure device." into lmp-dev
...
* commit '05fa2d44b34f420b9bf5c81d4403221581336a56':
Don't allow users to set redaction on an insecure device.
2014-09-01 11:25:33 +00:00
Andres Morales
bfa0f9d527
am 6afc60d1
: am 7228243b
: am ab61b0df
: Throw up ProgressDialog when erasing PST partition
...
* commit '6afc60d1003b4fa6ba3f01f6e95ec2434e4de6ea':
Throw up ProgressDialog when erasing PST partition
2014-09-01 11:25:32 +00:00
Baligh Uddin
03ef258222
Import translations. DO NOT MERGE
...
Change-Id: Ibb82d71b7e8230954b09c395e4eba7a37f30598d
Auto-generated-cl: translation import
2014-08-31 22:54:02 -07: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