Zoltan Szatmary-Ban
c91d2cd082
Merge "Put VPN settings under primary profile control" into lmp-dev
2014-09-04 12:38:48 +00:00
Zoltan Szatmary-Ban
0635a3b9dd
am 1e0ea452
: Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev
...
* commit '1e0ea452635fb3e8fbac733567489a38ee3ed635':
Start activity for the correct user in Settings > Data Usage
2014-09-04 12:06:15 +00:00
Zoltan Szatmary-Ban
1e0ea45263
Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev
2014-09-04 11:55:49 +00:00
Alexandra Gherghina
559308d88c
am 9dce0791
: Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev
...
* commit '9dce0791f8e9a0e91eabe61589c9a9c5f695f7b2':
Code clean-ups following moving the managed profile under accounts
2014-09-04 09:36:02 +00:00
Alexandra Gherghina
9dce0791f8
Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev
2014-09-04 09:26:03 +00:00
Baligh Uddin
fac397a5bf
Import translations. DO NOT MERGE
...
Change-Id: I46cb4475ee4c31d33f11c15cc33f6a4a2c045bc7
Auto-generated-cl: translation import
2014-09-03 23:11:31 -07:00
Fabrice Di Meglio
add95b1502
Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings
...
- add the requested infos
Change-Id: Ib2d07f79d8c2e2c85032d7ec595055254437ba19
2014-09-03 18:31:47 -07:00
Elliott Hughes
7253df35a0
Start cleaning up percentage formatting in Settings.
...
This fixes some of the percentage formatting issues, but there are
still about ten strings with hard-coded %%s in them.
Bug: 15476051
Change-Id: I668b6b16e598425f6006f6de0005c980f613f5b2
2014-09-03 17:04:01 -07:00
PauloftheWest
56217c05cd
Aligned buttons on the Wi-Fi Assistant Card.
...
Bug: 17305353
Change-Id: Iffdcd9b1248dc7e6bd13c9eeca267392d2171c86
2014-09-03 16:10:45 -07:00
Dan Sandler
d283f0fbd5
Don't block notifications from system packages.
...
Bug: 16703366
Change-Id: Id2f635e4e99df0c10afff8a0f5130179d381762c
2014-09-03 22:14:50 +00:00
PauloftheWest
92d191d0ef
am 7641e1ad
: Merge "Fixed an issue were "Saved Networks" would not appear correctly." into lmp-dev
...
* commit '7641e1ad44f6006cac1bd1b88ca09b3bab2cca78':
Fixed an issue were "Saved Networks" would not appear correctly.
2014-09-03 22:12:54 +00:00
PauloftheWest
7641e1ad44
Merge "Fixed an issue were "Saved Networks" would not appear correctly." into lmp-dev
2014-09-03 22:00:39 +00:00
Fabrice Di Meglio
06ef6dc940
am 52a48226
: Merge "Fix bug #17374913 Accessibility settings crashes when there is no accessibility service installed" into lmp-dev
...
* commit '52a48226ec0566570afd6f0d2c5287d9b727b339':
Fix bug #17374913 Accessibility settings crashes when there is no accessibility service installed
2014-09-03 20:51:26 +00:00
Fabrice Di Meglio
52a48226ec
Merge "Fix bug #17374913 Accessibility settings crashes when there is no accessibility service installed" into lmp-dev
2014-09-03 20:43:55 +00:00
Fabrice Di Meglio
89b170aa05
Fix bug #17374913 Accessibility settings crashes when there is no accessibility service installed
...
- use the Preference.setSummary(CharSequence) instead of trying to set the summary
manually
Change-Id: I3692c50e3821a34a9c03a614cbc40209157068f3
2014-09-03 13:40:08 -07:00
Fabrice Di Meglio
c4a8a6194c
am 815dc273
: Merge "Fix bug #17330962 Clicking a search result in Settings shows \'wireless_settings\' instead of \'More\'" into lmp-dev
...
* commit '815dc2738dcb1fe8abf9e436cae3e217edc77d95':
Fix bug #17330962 Clicking a search result in Settings shows 'wireless_settings' instead of 'More'
2014-09-03 20:13:11 +00:00
Fabrice Di Meglio
815dc2738d
Merge "Fix bug #17330962 Clicking a search result in Settings shows 'wireless_settings' instead of 'More'" into lmp-dev
2014-09-03 20:00:25 +00:00
Fabrice Di Meglio
28c6769c03
Fix bug #17330962 Clicking a search result in Settings shows 'wireless_settings' instead of 'More'
...
- revert to the correct string for the Preference screen title.
Change-Id: I17c58485875e71e5785d5879b60aebcf6c4d454a
2014-09-03 12:57:25 -07:00
Chris Wren
56131de741
Implement per-app sensitivity settings toggle.
...
Change-Id: I0e70e6ce5c4a56d738c1850c50c2e268296d9d92
Depends-On: I2d5cf6782273744cbf9b309dec76780cc0a4c39e
Bug: 16324353
2014-09-03 15:47:08 -04:00
Wink Saville
9e1b9437d4
am 418346d5
: Merge "Prepare to make SubscriptionManager public." into lmp-dev
...
* commit '418346d5cf6c41162031a0731927502f503163a1':
Prepare to make SubscriptionManager public.
2014-09-03 19:23:26 +00:00
Wink Saville
418346d5cf
Merge "Prepare to make SubscriptionManager public." into lmp-dev
2014-09-03 18:26:02 +00:00
Fabrice Di Meglio
f143bc62df
am b5caa647
: Merge "Fix bug #17208479 Have Cellular Networks Show up in Data Usage" into lmp-dev
...
* commit 'b5caa647e74729e0bcfabe12ca40b30a82dd906a':
Fix bug #17208479 Have Cellular Networks Show up in Data Usage
2014-09-03 18:11:41 +00:00
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