Diego Pontoriero
a6e7e4d55a
am ede4c009
: am 88e5901e
: Merge "Change TelephonyManager method name to accurately reflect functionality." into lmp-dev
...
* commit 'ede4c009d6da0fb8f5e2076f62a03ab73a067707':
Change TelephonyManager method name to accurately reflect functionality.
2014-08-28 23:02:25 +00:00
Selim Gurun
8cb90f4015
am a8028968
: am d578fc00
: Merge "Use GoogleSetting to override DRP setting if available" into lmp-dev
...
* commit 'a80289680d4badf3039c7e83dea7b9545363dbe5':
Use GoogleSetting to override DRP setting if available
2014-08-28 23:02:24 +00:00
Diego Pontoriero
ede4c009d6
am 88e5901e
: Merge "Change TelephonyManager method name to accurately reflect functionality." into lmp-dev
...
* commit '88e5901e58d69cdc9f59352fe3a672ed4ec39294':
Change TelephonyManager method name to accurately reflect functionality.
2014-08-28 22:48:45 +00:00
Selim Gurun
a80289680d
am d578fc00
: Merge "Use GoogleSetting to override DRP setting if available" into lmp-dev
...
* commit 'd578fc00b57c5d8d7122bb25d122e24779669fdb':
Use GoogleSetting to override DRP setting if available
2014-08-28 22:48:44 +00:00
Diego Pontoriero
88e5901e58
Merge "Change TelephonyManager method name to accurately reflect functionality." into lmp-dev
2014-08-28 22:38:47 +00:00
Selim Gurun
d578fc00b5
Merge "Use GoogleSetting to override DRP setting if available" into lmp-dev
2014-08-28 22:11:46 +00:00
Diego Pontoriero
be7adcc989
Change TelephonyManager method name to accurately reflect functionality.
...
Bug: 17163860
Change-Id: I319b3dc19c171108963113aa821e50842654a61e
2014-08-28 13:52:24 -07:00
Maurice Lam
e0a8c4b798
am 198ece9c
: am 7e392fd5
: Merge "[WifiSetup] Update illustration" into lmp-dev
...
* commit '198ece9c2f2977e741c471073a4b646f48dc67fb':
[WifiSetup] Update illustration
2014-08-28 20:47:02 +00:00
Maurice Lam
198ece9c2f
am 7e392fd5
: Merge "[WifiSetup] Update illustration" into lmp-dev
...
* commit '7e392fd59a9fcc89121148cb69c12a787683959c':
[WifiSetup] Update illustration
2014-08-28 20:35:16 +00:00
Maurice Lam
7e392fd59a
Merge "[WifiSetup] Update illustration" into lmp-dev
2014-08-28 20:27:01 +00:00
Chris Wren
c9dc1bea44
am 60e2678c
: am b874b5c6
: Merge "Don\'t show nonesensical notification visibility value." into lmp-dev
...
* commit '60e2678c6216f2ced0bebf6972323dd27749928a':
Don't show nonesensical notification visibility value.
2014-08-28 20:05:30 +00:00
Chris Wren
60e2678c62
am b874b5c6
: Merge "Don\'t show nonesensical notification visibility value." into lmp-dev
...
* commit 'b874b5c6da093ea61c00594d506eab5a310e40e8':
Don't show nonesensical notification visibility value.
2014-08-28 19:51:32 +00:00
Chris Wren
b874b5c6da
Merge "Don't show nonesensical notification visibility value." into lmp-dev
2014-08-28 19:44:29 +00:00
Adam Lesinski
c26722d036
am 54bff843
: am ce0083b0
: Merge "Update UI for UsageStatsSettings" into lmp-dev
...
* commit '54bff843ff5c1c4aaced95c2da854860546f8529':
Update UI for UsageStatsSettings
2014-08-28 19:27:26 +00:00
Adam Lesinski
54bff843ff
am ce0083b0
: Merge "Update UI for UsageStatsSettings" into lmp-dev
...
* commit 'ce0083b05ccf9564f923eb73413346531139dccc':
Update UI for UsageStatsSettings
2014-08-28 19:15:27 +00:00
Adam Lesinski
ce0083b05c
Merge "Update UI for UsageStatsSettings" into lmp-dev
2014-08-28 19:05:46 +00:00
Christoph Studer
135617f712
am cd507cdb
: am 755c97d6
: Merge "Settings: Increase no&sounds char limit to 30" into lmp-dev
...
* commit 'cd507cdb2257d7bf63d2cd9a074f1a78c7b73ce7':
Settings: Increase no&sounds char limit to 30
2014-08-28 18:46:53 +00:00
Christoph Studer
cd507cdb22
am 755c97d6
: Merge "Settings: Increase no&sounds char limit to 30" into lmp-dev
...
* commit '755c97d663533b20403493e82b261e8f1d246f7e':
Settings: Increase no&sounds char limit to 30
2014-08-28 18:34:40 +00:00
Christoph Studer
755c97d663
Merge "Settings: Increase no&sounds char limit to 30" into lmp-dev
2014-08-28 18:26:28 +00:00
Jeff Davidson
a1412099e0
am d4312cd3
: am d037d04d
: Merge "Fix crash in WifiSettings." into lmp-dev
...
* commit 'd4312cd3a94ac4954bb1e75f0c42be6537c9f01f':
Fix crash in WifiSettings.
2014-08-28 17:42:39 +00:00
Jeff Davidson
d4312cd3a9
am d037d04d
: Merge "Fix crash in WifiSettings." into lmp-dev
...
* commit 'd037d04dc4d1e2b2ce7da5efb5d863ddbdd589ed':
Fix crash in WifiSettings.
2014-08-28 17:34:31 +00:00
Jeff Davidson
d037d04dc4
Merge "Fix crash in WifiSettings." into lmp-dev
2014-08-28 17:25:58 +00:00
Jing Zhao
4af1146a82
am 8148f2f1
: am f04d69a1
: Test APNs
...
* commit '8148f2f17d3efb2b7a02b573e7657d9c46b1d641':
Test APNs
2014-08-28 16:46:48 +00:00
Jing Zhao
8148f2f17d
am f04d69a1
: Test APNs
...
* commit 'f04d69a1d405f88b2bebacd63c77e91789e81616':
Test APNs
2014-08-28 16:34:53 +00:00
Jing Zhao
f04d69a1d4
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
2014-08-28 16:22:19 +00:00
Christoph Studer
cf2e4d58db
Settings: Increase no&sounds char limit to 30
...
Bug: 17196576
Change-Id: I9baffcf19258e1d106b69a8738dbd387ec61def7
2014-08-28 15:01:19 +02:00
Sander Alewijnse
335bd1cd3c
am e64a2c5c
: am ddc9b2ce
: Merge "Disable auto time checkbox if date/time locked down by DO." into lmp-dev
...
* commit 'e64a2c5c6bfc1465a7c3ede08dde6a1b4ee27a0a':
Disable auto time checkbox if date/time locked down by DO.
2014-08-28 11:33:57 +00:00
Sander Alewijnse
e64a2c5c6b
am ddc9b2ce
: Merge "Disable auto time checkbox if date/time locked down by DO." into lmp-dev
...
* commit 'ddc9b2ce2377edd7ce914813be374c91be150569':
Disable auto time checkbox if date/time locked down by DO.
2014-08-28 11:22:14 +00:00
Sander Alewijnse
ddc9b2ce23
Merge "Disable auto time checkbox if date/time locked down by DO." into lmp-dev
2014-08-28 11:11:38 +00:00
Selim Cinek
1eaa9f948a
am e83d0f63
: am e58fda79
: Merge "Added colors to system notifications" into lmp-dev
...
* commit 'e83d0f63dd85eda69a0f5276bdf63cd97e0b7e4c':
Added colors to system notifications
2014-08-28 10:00:03 +00:00
Selim Cinek
e83d0f63dd
am e58fda79
: Merge "Added colors to system notifications" into lmp-dev
...
* commit 'e58fda7997fd2313f0592e4bb0477d22fe5b6fb4':
Added colors to system notifications
2014-08-28 09:46:17 +00:00
Selim Cinek
e58fda7997
Merge "Added colors to system notifications" into lmp-dev
2014-08-28 09:36:45 +00:00
Adam Lesinski
1813c6297f
Update UI for UsageStatsSettings
...
Bug: 16461070
Change-Id: I616421d5ff8124892a676b8f5302b2341773d6eb
2014-08-27 19:00:30 -07:00
Jeff Davidson
0a5402dcf9
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
2014-08-27 18:05:31 -07:00
Dianne Hackborn
239e1252ec
am d683f929
: am 6d1297ed
: Merge "Fix issues #16941902 , #16901402 , and #16135174." into lmp-dev
...
* commit 'd683f929424ed38b57e91c8d7c082a899da67d51':
Fix issues #16941902 , #16901402 , and #16135174 .
2014-08-27 23:54:18 +00:00
Dianne Hackborn
d683f92942
am 6d1297ed
: Merge "Fix issues #16941902 , #16901402 , and #16135174." into lmp-dev
...
* commit '6d1297ed1a9fa549e645855c54b9fb67d2020e4c':
Fix issues #16941902 , #16901402 , and #16135174 .
2014-08-27 23:41:54 +00:00
Dianne Hackborn
6d1297ed1a
Merge "Fix issues #16941902 , #16901402 , and #16135174." into lmp-dev
2014-08-27 23:35:04 +00:00
Maurice Lam
62c15e38d1
[WifiSetup] Update illustration
...
Update the illustration assets and make the tablet illustration
always 256dp height according to mock.
Bug: 17133710
Change-Id: I6d84bbb25a9f443e4eb6bf4c1002d8a1438029ef
2014-08-27 16:27:10 -07:00
PauloftheWest
306b4a4128
am 11a40303
: am ebcce208
: Adding wifi empty state icon back for Setup Wizard.
...
* commit '11a40303c8cf303fa8730bd95726720a9afdf6c0':
Adding wifi empty state icon back for Setup Wizard.
2014-08-27 23:12:38 +00:00
PauloftheWest
11a40303c8
am ebcce208
: Adding wifi empty state icon back for Setup Wizard.
...
* commit 'ebcce2088aef507a6a1a9a822416a12b16db9fe6':
Adding wifi empty state icon back for Setup Wizard.
2014-08-27 23:05:29 +00:00
Dianne Hackborn
be300225df
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
2014-08-27 15:49:01 -07:00
PauloftheWest
ebcce2088a
Adding wifi empty state icon back for Setup Wizard.
...
Change-Id: Id20ee2a35512b7a9560db5d121fef5d0351fe051
2014-08-27 15:48:53 -07:00
PauloftheWest
41efe71fab
am bac5a389
: am 3d319d0b
: Merge "Greyed out SIM activities if only one SIM is present." into lmp-dev
...
* commit 'bac5a3892dd7e1999f8e33fe7b4e28e3f0530cd9':
Greyed out SIM activities if only one SIM is present.
2014-08-27 21:58:18 +00:00
PauloftheWest
7c99c2278e
am 75235a29
: am a14e3f33
: Merge "Removed the Wi-Fi icon shown when Wi-Fi is off." into lmp-dev
...
* commit '75235a2974b7cba932edee1719167c5c16fc44dc':
Removed the Wi-Fi icon shown when Wi-Fi is off.
2014-08-27 21:58:17 +00:00
PauloftheWest
bac5a3892d
am 3d319d0b
: Merge "Greyed out SIM activities if only one SIM is present." into lmp-dev
...
* commit '3d319d0b905199931831098e68aadbad67314ed1':
Greyed out SIM activities if only one SIM is present.
2014-08-27 21:48:51 +00:00
PauloftheWest
75235a2974
am a14e3f33
: Merge "Removed the Wi-Fi icon shown when Wi-Fi is off." into lmp-dev
...
* commit 'a14e3f3373170ae126531a21bd9a121e0d886e53':
Removed the Wi-Fi icon shown when Wi-Fi is off.
2014-08-27 21:48:47 +00:00
PauloftheWest
3d319d0b90
Merge "Greyed out SIM activities if only one SIM is present." into lmp-dev
2014-08-27 21:41:27 +00:00
PauloftheWest
a14e3f3373
Merge "Removed the Wi-Fi icon shown when Wi-Fi is off." into lmp-dev
2014-08-27 21:40:09 +00:00
PauloftheWest
55d106786a
am 81fafc51
: am db99ad93
: Merge "Bluetooth Device picker will now scan for devices." into lmp-dev
...
* commit '81fafc5143cf41764c7286b48824f50cc0d957fc':
Bluetooth Device picker will now scan for devices.
2014-08-27 21:36:58 +00:00
PauloftheWest
7926eb04d9
am caccf27e
: am d0ec53e3
: Merge "Applied Material Spec to Bluetooth pairing dialog." into lmp-dev
...
* commit 'caccf27e3446a0e7029b1860ae4a92ce4142f355':
Applied Material Spec to Bluetooth pairing dialog.
2014-08-27 21:36:37 +00:00