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
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
Maurice Lam
8dade422e5
Merge "[WifiSetup] Workaround for accessibility in landscape" into lmp-dev
2014-08-29 01:55:09 +00:00
Maurice Lam
182c239730
[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
2014-08-28 18:21:52 -07: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
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
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
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
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
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
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
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
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
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
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
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
81fafc5143
am db99ad93
: Merge "Bluetooth Device picker will now scan for devices." into lmp-dev
...
* commit 'db99ad9349c16665e3ca6c62192fe560d35d4a68':
Bluetooth Device picker will now scan for devices.
2014-08-27 21:11:43 +00:00
PauloftheWest
db99ad9349
Merge "Bluetooth Device picker will now scan for devices." into lmp-dev
2014-08-27 21:01:47 +00:00
PauloftheWest
9432b926fe
Bluetooth Device picker will now scan for devices.
...
Bug: 17157824
Change-Id: Ifcf17f55e942dbf6cdbe2a2ee30c90ddbd9c4bd8
2014-08-27 13:56:04 -07:00
PauloftheWest
caccf27e34
am d0ec53e3
: Merge "Applied Material Spec to Bluetooth pairing dialog." into lmp-dev
...
* commit 'd0ec53e33360cfb5cf4c176920917ef109754f22':
Applied Material Spec to Bluetooth pairing dialog.
2014-08-27 20:42:57 +00:00
PauloftheWest
fc4f23f0e7
am 6213ba0e
: Merge "Changed VPN add icon to white." into lmp-dev
...
* commit '6213ba0ea107eabb6c9053c843c2c675ac03cfa4':
Changed VPN add icon to white.
2014-08-27 20:42:56 +00:00