PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,895 Commits 1 Branch 0 Tags
7c2bb73f03953e71bbba12f90c64aaeb2ecfd35a
Commit Graph

15895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selim Gurun
7c2bb73f03 am 8cb90f40: am a8028968: am d578fc00: Merge "Use GoogleSetting to override DRP setting if available" into lmp-dev 
* commit '8cb90f4015e13c3e4b916773f23a0d8455205383':
  Use GoogleSetting to override DRP setting if available
 2014-08-28 23:18:55 +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
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
Selim Gurun
d578fc00b5 Merge "Use GoogleSetting to override DRP setting if available" into lmp-dev 2014-08-28 22:11:46 +00:00
Maurice Lam
48742229fb am e0a8c4b7: am 198ece9c: am 7e392fd5: Merge "[WifiSetup] Update illustration" into lmp-dev 
* commit 'e0a8c4b7987ba0253eb7982a4235c8f5b539385a':
  [WifiSetup] Update illustration
 2014-08-28 20:54:07 +00: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
ef3c66ed2b am c9dc1bea: am 60e2678c: am b874b5c6: Merge "Don\'t show nonesensical notification visibility value." into lmp-dev 
* commit 'c9dc1bea44c95ba3ef4abab2e169fd6193a19493':
  Don't show nonesensical notification visibility value.
 2014-08-28 20:16:04 +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
77ff1c62be am c26722d0: am 54bff843: am ce0083b0: Merge "Update UI for UsageStatsSettings" into lmp-dev 
* commit 'c26722d036b05d4a0dbfcc6fe87cbd8ce1b15b03':
  Update UI for UsageStatsSettings
 2014-08-28 19:39:05 +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
9e110f2672 am 135617f7: am cd507cdb: am 755c97d6: Merge "Settings: Increase no&sounds char limit to 30" into lmp-dev 
* commit '135617f7122a3b2ef94811ac982b94990116e2bb':
  Settings: Increase no&sounds char limit to 30
 2014-08-28 18:53:07 +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
d08a52665a am a1412099: am d4312cd3: am d037d04d: Merge "Fix crash in WifiSettings." into lmp-dev 
* commit 'a1412099e03f50a2cfe6233f47518a301c4e73ef':
  Fix crash in WifiSettings.
 2014-08-28 17:54:56 +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
afa266afb4 am 4af1146a: am 8148f2f1: am f04d69a1: Test APNs 
* commit '4af1146a8222f6e5940ec9a4009c4dc095c07c5c':
  Test APNs
 2014-08-28 16:53:19 +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
8ef10fd001 am 335bd1cd: am e64a2c5c: am ddc9b2ce: Merge "Disable auto time checkbox if date/time locked down by DO." into lmp-dev 
* commit '335bd1cd3c9b311b70f12a32087f267e649c72f8':
  Disable auto time checkbox if date/time locked down by DO.
 2014-08-28 11:46:33 +00: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
432ff4e53e am 1eaa9f94: am e83d0f63: am e58fda79: Merge "Added colors to system notifications" into lmp-dev 
* commit '1eaa9f948aa02c98afa00c6ec6a6deff72931705':
  Added colors to system notifications
 2014-08-28 10:10:10 +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
c776091086 am 239e1252: am d683f929: am 6d1297ed: Merge "Fix issues #16941902, #16901402, and #16135174." into lmp-dev 
* commit '239e1252ec5074f59f7d2436b4caf3d323fe8ff6':
  Fix issues #16941902, #16901402, and #16135174.
 2014-08-28 00:05:23 +00: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
6c1523d3cf am 306b4a41: am 11a40303: am ebcce208: Adding wifi empty state icon back for Setup Wizard. 
* commit '306b4a4128d8e21157fd4b68f815b93f91aa1cf6':
  Adding wifi empty state icon back for Setup Wizard.
 2014-08-27 23:23:48 +00: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
16a078d699 am 41efe71f: am bac5a389: am 3d319d0b: Merge "Greyed out SIM activities if only one SIM is present." into lmp-dev 
* commit '41efe71fabf25113cc8107c083a218f21ba602fb':
  Greyed out SIM activities if only one SIM is present.
 2014-08-27 22:06:16 +00:00