OSDN Git Service
Fabrice Di Meglio [Thu, 4 Sep 2014 17:10:59 +0000 (17:10 +0000)]
am
5a8a75d9: Merge "Fix bug #
17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev
* commit '
5a8a75d98bcbd06e6ff18c79e5852d4ad833bbc6':
Fix bug #
17358371 Wallpaper attributions in "Legal Information" section of Settings
Fabrice Di Meglio [Thu, 4 Sep 2014 17:01:15 +0000 (17:01 +0000)]
Merge "Fix bug #
17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev
Chris Wren [Thu, 4 Sep 2014 13:57:30 +0000 (13:57 +0000)]
am
ee846f88: missing dep. Revert "Implement per-app sensitivity settings toggle."
* commit '
ee846f8828f9e2988e646af85da55f3d51c02f27':
missing dep. Revert "Implement per-app sensitivity settings toggle."
Chris Wren [Thu, 4 Sep 2014 13:41:08 +0000 (13:41 +0000)]
missing dep. Revert "Implement per-app sensitivity settings toggle."
This reverts commit
56131de7412edaab9f3e5834fe3888ac8588ec79.
Change-Id: I409dbf4495f95ff37d2a47168cdbc4131a80d42e
Chris Wren [Thu, 4 Sep 2014 13:46:49 +0000 (13:46 +0000)]
am
77fdc93b: Merge "Implement per-app sensitivity settings toggle." into lmp-dev
* commit '
77fdc93bcdb3ae60fe617012c6c52aa274ed331e':
Implement per-app sensitivity settings toggle.
Chris Wren [Thu, 4 Sep 2014 13:40:04 +0000 (13:40 +0000)]
Merge "Implement per-app sensitivity settings toggle." into lmp-dev
Dan Sandler [Thu, 4 Sep 2014 13:25:34 +0000 (13:25 +0000)]
am
feec34ce: Merge "Don\'t block notifications from system packages." into lmp-dev
* commit '
feec34cec83b87f0c9e88b0d5883bd65170398bf':
Don't block notifications from system packages.
Dan Sandler [Thu, 4 Sep 2014 13:15:47 +0000 (13:15 +0000)]
Merge "Don't block notifications from system packages." into lmp-dev
PauloftheWest [Thu, 4 Sep 2014 12:55:11 +0000 (12:55 +0000)]
am
e1a164bf: Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev
* commit '
e1a164bf9be2d32da3c6154eca14230677a49283':
Aligned buttons on the Wi-Fi Assistant Card.
PauloftheWest [Thu, 4 Sep 2014 12:50:03 +0000 (12:50 +0000)]
Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev
Zoltan Szatmary-Ban [Thu, 4 Sep 2014 12:45:09 +0000 (12:45 +0000)]
am
c91d2cd0: Merge "Put VPN settings under primary profile control" into lmp-dev
* commit '
c91d2cd082b5b682bb957085862b54431485f43a':
Put VPN settings under primary profile control
Zoltan Szatmary-Ban [Thu, 4 Sep 2014 12:38:48 +0000 (12:38 +0000)]
Merge "Put VPN settings under primary profile control" into lmp-dev
Zoltan Szatmary-Ban [Thu, 4 Sep 2014 12:05:48 +0000 (12:05 +0000)]
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
Zoltan Szatmary-Ban [Thu, 4 Sep 2014 11:55:48 +0000 (11:55 +0000)]
Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev
Alexandra Gherghina [Thu, 4 Sep 2014 09:36:20 +0000 (09:36 +0000)]
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
Alexandra Gherghina [Thu, 4 Sep 2014 09:26:02 +0000 (09:26 +0000)]
Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev
Fabrice Di Meglio [Thu, 4 Sep 2014 01:25:43 +0000 (18:25 -0700)]
Fix bug #
17358371 Wallpaper attributions in "Legal Information" section of Settings
- add the requested infos
Change-Id: Ib2d07f79d8c2e2c85032d7ec595055254437ba19
PauloftheWest [Wed, 3 Sep 2014 23:24:29 +0000 (23:24 +0000)]
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.
Fabrice Di Meglio [Wed, 3 Sep 2014 23:23:22 +0000 (23:23 +0000)]
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
Fabrice Di Meglio [Wed, 3 Sep 2014 23:22:41 +0000 (23:22 +0000)]
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'
Wink Saville [Wed, 3 Sep 2014 23:21:09 +0000 (23:21 +0000)]
am
418346d5: Merge "Prepare to make SubscriptionManager public." into lmp-dev
* commit '
418346d5cf6c41162031a0731927502f503163a1':
Prepare to make SubscriptionManager public.
PauloftheWest [Thu, 28 Aug 2014 21:10:36 +0000 (14:10 -0700)]
Aligned buttons on the Wi-Fi Assistant Card.
Bug:
17305353
Change-Id: Iffdcd9b1248dc7e6bd13c9eeca267392d2171c86
Dan Sandler [Wed, 3 Sep 2014 14:48:13 +0000 (16:48 +0200)]
Don't block notifications from system packages.
Bug:
16703366
Change-Id: Id2f635e4e99df0c10afff8a0f5130179d381762c
PauloftheWest [Wed, 3 Sep 2014 22:00:38 +0000 (22:00 +0000)]
Merge "Fixed an issue were "Saved Networks" would not appear correctly." into lmp-dev
Fabrice Di Meglio [Wed, 3 Sep 2014 20:43:55 +0000 (20:43 +0000)]
Merge "Fix bug #
17374913 Accessibility settings crashes when there is no accessibility service installed" into lmp-dev
Fabrice Di Meglio [Wed, 3 Sep 2014 20:40:08 +0000 (13:40 -0700)]
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
Fabrice Di Meglio [Wed, 3 Sep 2014 20:00:25 +0000 (20:00 +0000)]
Merge "Fix bug #
17330962 Clicking a search result in Settings shows 'wireless_settings' instead of 'More'" into lmp-dev
Fabrice Di Meglio [Wed, 3 Sep 2014 19:57:25 +0000 (12:57 -0700)]
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
Chris Wren [Tue, 2 Sep 2014 21:26:17 +0000 (17:26 -0400)]
Implement per-app sensitivity settings toggle.
Change-Id: I0e70e6ce5c4a56d738c1850c50c2e268296d9d92
Depends-On: I2d5cf6782273744cbf9b309dec76780cc0a4c39e
Bug:
16324353
Wink Saville [Wed, 3 Sep 2014 18:26:02 +0000 (18:26 +0000)]
Merge "Prepare to make SubscriptionManager public." into lmp-dev
Fabrice Di Meglio [Wed, 3 Sep 2014 18:11:10 +0000 (18:11 +0000)]
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
Fabrice Di Meglio [Wed, 3 Sep 2014 17:56:07 +0000 (17:56 +0000)]
Merge "Fix bug #
17208479 Have Cellular Networks Show up in Data Usage" into lmp-dev
Dan Sandler [Wed, 3 Sep 2014 17:06:12 +0000 (17:06 +0000)]
am
b58b5127: Fix links to notification settings activities.
* commit '
b58b5127040b3c843fe42544a89a1085cf7e74f6':
Fix links to notification settings activities.
Vinit Deshpande [Wed, 3 Sep 2014 16:42:30 +0000 (16:42 +0000)]
am
963ce475: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev
* commit '
963ce47525144879d295b5f54b04225220f74866':
Address API Council feedback for WifiAdapter/WPS APIs
Amith Yamasani [Wed, 3 Sep 2014 16:42:29 +0000 (16:42 +0000)]
am
99ad06c2: Merge "Change the location mode before applying restrictions" into lmp-dev
* commit '
99ad06c2a15200cfd83da7cf2131c8127f55544c':
Change the location mode before applying restrictions
Dan Sandler [Tue, 2 Sep 2014 16:31:49 +0000 (18:31 +0200)]
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
PauloftheWest [Tue, 2 Sep 2014 21:22:55 +0000 (14:22 -0700)]
Fixed an issue were "Saved Networks" would not appear correctly.
Bug:
17284538
Change-Id: Id93cd93f94a59437b04d41d4b0412d3b22575e17
Alexandra Gherghina [Wed, 3 Sep 2014 10:01:45 +0000 (11:01 +0100)]
Code clean-ups following moving the managed profile under accounts
Bug:
16234745
Change-Id: I7b4799157394a85a27610de7e059c846f77dda02
Wink Saville [Wed, 3 Sep 2014 05:40:55 +0000 (22:40 -0700)]
Prepare to make SubscriptionManager public.
Sync SubscriptionManager and its dependentes between lmp-dev
and lmp-sprout-dev.
Change-Id: Ie06ced3e7ff5a3d06b3b47892fed22b4bb8972c7
Fabrice Di Meglio [Wed, 3 Sep 2014 01:22:09 +0000 (18:22 -0700)]
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
Vinit Deshpande [Wed, 3 Sep 2014 00:59:56 +0000 (00:59 +0000)]
Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev
Amith Yamasani [Wed, 3 Sep 2014 00:56:28 +0000 (00:56 +0000)]
Merge "Change the location mode before applying restrictions" into lmp-dev
Amith Yamasani [Wed, 3 Sep 2014 00:10:18 +0000 (17:10 -0700)]
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
PauloftheWest [Tue, 2 Sep 2014 21:38:49 +0000 (21:38 +0000)]
am
ebe496ea: Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev
* commit '
ebe496ea7b18c5d702db4beee270046e43e491ad':
Fixed a crash when loading Bluetooth Settings.
PauloftheWest [Tue, 2 Sep 2014 21:31:22 +0000 (21:31 +0000)]
Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev
PauloftheWest [Wed, 27 Aug 2014 23:08:49 +0000 (16:08 -0700)]
Fixed a crash when loading Bluetooth Settings.
Bug:
17320674
Change-Id: Ibff0b5929b88b1a48c1fdd810fd8461bdb5f1274
Jason Monk [Tue, 2 Sep 2014 20:14:20 +0000 (20:14 +0000)]
am
dc4818ab: Merge "Bring back auto-rotate to settings" into lmp-dev
* commit '
dc4818ab7aa959143a1eb0b88bf0a4c9e6d19380':
Bring back auto-rotate to settings
Jason Monk [Tue, 2 Sep 2014 20:04:35 +0000 (20:04 +0000)]
Merge "Bring back auto-rotate to settings" into lmp-dev
Jason Monk [Wed, 20 Aug 2014 17:29:20 +0000 (13:29 -0400)]
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
Paul Lawrence [Tue, 2 Sep 2014 19:44:56 +0000 (19:44 +0000)]
am
1f06a89f: Merge "Get correct factory reset reason from encryption failure" into lmp-dev
* commit '
1f06a89f468d7998a271b49dfbbdd7ea1f5b01a3':
Get correct factory reset reason from encryption failure
Paul Lawrence [Tue, 2 Sep 2014 19:33:25 +0000 (19:33 +0000)]
Merge "Get correct factory reset reason from encryption failure" into lmp-dev
Maurice Lam [Tue, 2 Sep 2014 19:01:46 +0000 (19:01 +0000)]
am
def48d60: Merge "[WifiSetup] Add shadow below header" into lmp-dev
* commit '
def48d605abe4fe597dbcea5e7c2f9ca93f1b237':
[WifiSetup] Add shadow below header
Maurice Lam [Tue, 2 Sep 2014 18:51:36 +0000 (18:51 +0000)]
Merge "[WifiSetup] Add shadow below header" into lmp-dev
PauloftheWest [Tue, 2 Sep 2014 18:27:20 +0000 (18:27 +0000)]
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.
Paul Lawrence [Thu, 28 Aug 2014 22:56:38 +0000 (15:56 -0700)]
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
PauloftheWest [Tue, 2 Sep 2014 18:11:37 +0000 (18:11 +0000)]
Merge "Fixed a Null Pointer Exception when Wifi Settings is indexing." into lmp-dev
Fabrice Di Meglio [Tue, 2 Sep 2014 17:21:58 +0000 (17:21 +0000)]
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)
Fabrice Di Meglio [Tue, 2 Sep 2014 17:13:41 +0000 (17:13 +0000)]
Merge "Fix bug #
17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)" into lmp-dev
Dan Sandler [Tue, 2 Sep 2014 15:40:13 +0000 (15:40 +0000)]
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.
Dan Sandler [Tue, 2 Sep 2014 15:32:41 +0000 (15:32 +0000)]
Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev
PauloftheWest [Tue, 2 Sep 2014 13:48:03 +0000 (06:48 -0700)]
Fixed a Null Pointer Exception when Wifi Settings is indexing.
Bug:
17335468
Change-Id: I85293e882d90da4a54d4690ffec32fba7101b65e
PauloftheWest [Tue, 2 Sep 2014 13:12:01 +0000 (13:12 +0000)]
am
d6cfeba9: Merge "Updated Wifi Assistant to support RTL." into lmp-dev
* commit '
d6cfeba9f717fe043efc56d4bdf18a18e4bb9bff':
Updated Wifi Assistant to support RTL.
PauloftheWest [Tue, 2 Sep 2014 13:00:30 +0000 (13:00 +0000)]
Merge "Updated Wifi Assistant to support RTL." into lmp-dev
Dan Sandler [Mon, 1 Sep 2014 23:05:27 +0000 (01:05 +0200)]
Switch to vibrate (or slash-bell) icon at ringer volume 0.
Bug:
16900054
Change-Id: If94a18a7cac596c0f4c33421b642f96dcf0280fd
Baligh Uddin [Mon, 1 Sep 2014 21:43:55 +0000 (21:43 +0000)]
am
48d3f0fd: (-s ours) Import translations. DO NOT MERGE
* commit '
48d3f0fd612b740f92fc1c268c27eb9e55a2ef68':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 1 Sep 2014 21:31:28 +0000 (21:31 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Baligh Uddin [Mon, 1 Sep 2014 05:43:19 +0000 (22:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia06570df1e52b2dd91ac4dda2f56bb2d2f4333de
Auto-generated-cl: translation import
Baligh Uddin [Mon, 1 Sep 2014 05:40:04 +0000 (22:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icb08251fbb0bc518bde18c174fedf464b0635486
Auto-generated-cl: translation import
Wink Saville [Mon, 1 Sep 2014 02:21:02 +0000 (19:21 -0700)]
ksd to lmp-sprout-dev
Change-Id: I94eb65c62231b5831570bb0cbbbd9c916bee0a37
Fabrice Di Meglio [Sat, 30 Aug 2014 00:44:52 +0000 (17:44 -0700)]
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
Maurice Lam [Fri, 29 Aug 2014 22:17:42 +0000 (15:17 -0700)]
[WifiSetup] Add shadow below header
Added shadow for phone portrait and landscape layouts
Bug:
17136887
Change-Id: I65dc01d7387812681bbc99d5cc9440714a72ff60
Vinit Deshpande [Fri, 29 Aug 2014 20:16:40 +0000 (13:16 -0700)]
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
Chris Wren [Fri, 29 Aug 2014 20:51:00 +0000 (20:51 +0000)]
Merge "Allow external packages to open the RedactionInsterstitial." into lmp-dev
Chris Wren [Fri, 29 Aug 2014 20:08:37 +0000 (20:08 +0000)]
Merge "default to lock_screen_notifications_summary_show." into lmp-dev
Chris Wren [Fri, 29 Aug 2014 20:07:44 +0000 (20:07 +0000)]
Merge "Don't allow users to set redaction on an insecure device." into lmp-dev
Andres Morales [Tue, 26 Aug 2014 20:54:12 +0000 (13:54 -0700)]
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
Chris Wren [Thu, 28 Aug 2014 19:45:31 +0000 (15:45 -0400)]
Allow external packages to open the RedactionInsterstitial.
Introduce RedactionSettingsStandalone, to supply the private setup
required by RedactionInsterstitial.
Bug:
15934899
Change-Id: Ie0bcc207c4f331def207e588bbad36b8986fe114
Chris Wren [Wed, 27 Aug 2014 18:16:48 +0000 (14:16 -0400)]
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
Chris Wren [Thu, 28 Aug 2014 21:52:39 +0000 (17:52 -0400)]
Don't allow users to set redaction on an insecure device.
Bug:
17106788
Change-Id: I05f8f4d920158fe99186fb8b879278d6780b8722
Maurice Lam [Fri, 29 Aug 2014 01:55:08 +0000 (01:55 +0000)]
Merge "[WifiSetup] Workaround for accessibility in landscape" into lmp-dev
Maurice Lam [Fri, 29 Aug 2014 01:21:52 +0000 (18:21 -0700)]
[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
Diego Pontoriero [Thu, 28 Aug 2014 22:38:46 +0000 (22:38 +0000)]
Merge "Change TelephonyManager method name to accurately reflect functionality." into lmp-dev
Selim Gurun [Thu, 28 Aug 2014 22:11:45 +0000 (22:11 +0000)]
Merge "Use GoogleSetting to override DRP setting if available" into lmp-dev
Diego Pontoriero [Thu, 28 Aug 2014 20:52:24 +0000 (13:52 -0700)]
Change TelephonyManager method name to accurately reflect functionality.
Bug:
17163860
Change-Id: I319b3dc19c171108963113aa821e50842654a61e
PauloftheWest [Thu, 21 Aug 2014 18:44:11 +0000 (11:44 -0700)]
Updated Wifi Assistant to support RTL.
Bug:
16798953
Change-Id: I9dc96a5a02fdc0e6b66a1ab5ddcaed95848b9c64
Maurice Lam [Thu, 28 Aug 2014 20:27:01 +0000 (20:27 +0000)]
Merge "[WifiSetup] Update illustration" into lmp-dev
Chris Wren [Thu, 28 Aug 2014 19:44:28 +0000 (19:44 +0000)]
Merge "Don't show nonesensical notification visibility value." into lmp-dev
Adam Lesinski [Thu, 28 Aug 2014 19:05:44 +0000 (19:05 +0000)]
Merge "Update UI for UsageStatsSettings" into lmp-dev
Christoph Studer [Thu, 28 Aug 2014 18:26:27 +0000 (18:26 +0000)]
Merge "Settings: Increase no&sounds char limit to 30" into lmp-dev
Jeff Davidson [Thu, 28 Aug 2014 17:25:58 +0000 (17:25 +0000)]
Merge "Fix crash in WifiSettings." into lmp-dev
Jing Zhao [Tue, 26 Aug 2014 19:44:02 +0000 (14:44 -0500)]
Test APNs
Add test APNs to carriers table.
Enable APN Setting editing for testing PLMNs.
Allow user to toggle carrier_enabled for test APNs.
Bug:
17136661
Change-Id: Ieabfac5ea02a5b9971c7050d8278ad0095863e3a
Christoph Studer [Thu, 28 Aug 2014 13:01:19 +0000 (15:01 +0200)]
Settings: Increase no&sounds char limit to 30
Bug:
17196576
Change-Id: I9baffcf19258e1d106b69a8738dbd387ec61def7
Sander Alewijnse [Thu, 28 Aug 2014 11:11:37 +0000 (11:11 +0000)]
Merge "Disable auto time checkbox if date/time locked down by DO." into lmp-dev
Selim Cinek [Thu, 28 Aug 2014 09:36:44 +0000 (09:36 +0000)]
Merge "Added colors to system notifications" into lmp-dev
Adam Lesinski [Thu, 28 Aug 2014 02:00:30 +0000 (19:00 -0700)]
Update UI for UsageStatsSettings
Bug:
16461070
Change-Id: I616421d5ff8124892a676b8f5302b2341773d6eb
Jeff Davidson [Thu, 28 Aug 2014 01:05:31 +0000 (18:05 -0700)]
Fix crash in WifiSettings.
SDK version is an int, not a long. (Also change SharedPreference key
to avoid issues for people who've already dismissed the Wifi Assistant
card).
Bug:
17304642
Change-Id: Ic959516b88e91edd53562703fa7db9c15ead20e4
Dianne Hackborn [Wed, 27 Aug 2014 23:35:04 +0000 (23:35 +0000)]
Merge "Fix issues #
16941902, #
16901402, and #
16135174." into lmp-dev
Maurice Lam [Wed, 27 Aug 2014 17:08:44 +0000 (10:08 -0700)]
[WifiSetup] Update illustration
Update the illustration assets and make the tablet illustration
always 256dp height according to mock.
Bug:
17133710
Change-Id: I6d84bbb25a9f443e4eb6bf4c1002d8a1438029ef
Dianne Hackborn [Wed, 27 Aug 2014 21:04:32 +0000 (14:04 -0700)]
Fix issues #
16941902, #
16901402, and #
16135174.
Issue #
16941902: Charged % of battery is mismatching between phone status
area(top right corner) and battery screen
Need to make sure the stats are updated when we come back to
the foreground.
Issue #
16901402: Crash in Settings observed after tap on Battery option
Don't allow us to have a null stats object.
Issue #
16135174: Apps page "smoke" gradient footer must be removed
Finish tweaking layout to match mocks.
Change-Id: I29d56b506a9468ec548feef7c3f9502a9b16ef4d
PauloftheWest [Wed, 27 Aug 2014 22:48:53 +0000 (15:48 -0700)]
Adding wifi empty state icon back for Setup Wizard.
Change-Id: Id20ee2a35512b7a9560db5d121fef5d0351fe051
OSDN Git Service
