Fabrice Di Meglio
b5caa647e7
Merge "Fix bug #17208479 Have Cellular Networks Show up in Data Usage" into lmp-dev
2014-09-03 17:56:08 +00:00
Dan Sandler
148d9428bc
am b58b5127
: Fix links to notification settings activities.
...
* commit 'b58b5127040b3c843fe42544a89a1085cf7e74f6':
Fix links to notification settings activities.
2014-09-03 16:19:25 +00:00
Dan Sandler
b58b512704
Fix links to notification settings activities.
...
Additionally, we now show the user a list of "app-like"
things (packages with launchable activities) instead of only
non-system things. This way you can make (some) changes to
system package notifications while not having to page
through reams of random non-app packages.
Bug: 17277023
Change-Id: I920d6b941070efb75a816e6ad38b798b09a83d08
2014-09-03 16:37:51 +02:00
PauloftheWest
de29d04fae
Fixed an issue were "Saved Networks" would not appear correctly.
...
Bug: 17284538
Change-Id: Id93cd93f94a59437b04d41d4b0412d3b22575e17
2014-09-03 05:42:14 -07:00
Alexandra Gherghina
e529bb9841
Code clean-ups following moving the managed profile under accounts
...
Bug: 16234745
Change-Id: I7b4799157394a85a27610de7e059c846f77dda02
2014-09-03 11:01:45 +01:00
Wink Saville
d857104325
Prepare to make SubscriptionManager public.
...
Sync SubscriptionManager and its dependentes between lmp-dev
and lmp-sprout-dev.
Change-Id: Ie06ced3e7ff5a3d06b3b47892fed22b4bb8972c7
2014-09-02 22:46:42 -07:00
Fabrice Di Meglio
14be7d23a2
Fix bug #17208479 Have Cellular Networks Show up in Data Usage
...
- prevent collisions in the DocId (which is the primary key of
the FTS4 table)
- instead of just using "updatedTitle" hash, use instead
"updatedTitle + screenTitle"
Change-Id: If38f7bcc7fb857d59242d08c16c39adb80590254
2014-09-02 18:31:10 -07:00
Vinit Deshpande
7b3a67b369
am 963ce475
: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev
...
* commit '963ce47525144879d295b5f54b04225220f74866':
Address API Council feedback for WifiAdapter/WPS APIs
2014-09-03 01:03:06 +00:00
Amith Yamasani
b1de932ec6
am 99ad06c2
: Merge "Change the location mode before applying restrictions" into lmp-dev
...
* commit '99ad06c2a15200cfd83da7cf2131c8127f55544c':
Change the location mode before applying restrictions
2014-09-03 01:03:05 +00:00
Vinit Deshpande
963ce47525
Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev
2014-09-03 00:59:57 +00:00
Amith Yamasani
99ad06c2a1
Merge "Change the location mode before applying restrictions" into lmp-dev
2014-09-03 00:56:28 +00:00
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
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
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
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
1f06a89f46
Merge "Get correct factory reset reason from encryption failure" into lmp-dev
2014-09-02 19:33:25 +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
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
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
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
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
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
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
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
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