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

5219 Commits

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
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
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
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
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
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
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
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
Adam Lesinski
1813c6297f Update UI for UsageStatsSettings 
Bug: 16461070
Change-Id: I616421d5ff8124892a676b8f5302b2341773d6eb
 2014-08-27 19:00:30 -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
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
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
7670de127c am 7c99c227: am 75235a29: am a14e3f33: Merge "Removed the Wi-Fi icon shown when Wi-Fi is off." into lmp-dev 
* commit '7c99c2278e9415e70a258ced14f8f8170827cec6':
  Removed the Wi-Fi icon shown when Wi-Fi is off.
 2014-08-27 22:06:15 +00:00
PauloftheWest
e4d0662ec5 am 55d10678: am 81fafc51: am db99ad93: Merge "Bluetooth Device picker will now scan for devices." into lmp-dev 
* commit '55d106786a4e6a923dcbb3aa2926659abbd00e51':
  Bluetooth Device picker will now scan for devices.
 2014-08-27 21:50:09 +00:00
PauloftheWest
da75eae851 am 7926eb04: am caccf27e: am d0ec53e3: Merge "Applied Material Spec to Bluetooth pairing dialog." into lmp-dev 
* commit '7926eb04d94077d25d08697ea0c60e72eee506ac':
  Applied Material Spec to Bluetooth pairing dialog.
 2014-08-27 21:50:03 +00:00
PauloftheWest
680f2fa97f am 0b618179: am fc4f23f0: am 6213ba0e: Merge "Changed VPN add icon to white." into lmp-dev 
* commit '0b618179acb56e64d205d0aada50dda31889657a':
  Changed VPN add icon to white.
 2014-08-27 21:50:02 +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
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
PauloftheWest
d0ec53e333 Merge "Applied Material Spec to Bluetooth pairing dialog." into lmp-dev 2014-08-27 20:40:38 +00:00
PauloftheWest
e49c30e533 Applied Material Spec to Bluetooth pairing dialog. 
Bug: 17018290
Change-Id: I621164245e6ad8213a689ea4919c619a9ee4f189
 2014-08-27 13:17:51 -07:00
PauloftheWest
5c6222e971 Changed VPN add icon to white. 
Bug: 17288198
Change-Id: I5d66f269583d1d4bdb3e68fe011721ae805317e1
 2014-08-27 12:54:50 -07:00
Baligh Uddin
5b025e75fb Import translations. DO NOT MERGE 
Change-Id: I390fa4d46d53d077b371b1f0cc2d880208aedb7f
Auto-generated-cl: translation import
 2014-08-26 21:00:49 -07:00
Baligh Uddin
a34ecf41b8 Import translations. DO NOT MERGE 
Change-Id: I8ac9cf419f62a3420117bcaaffe4dca023ee1c9d
Auto-generated-cl: translation import
 2014-08-26 20:49:33 -07:00
Alan Viverette
1d439572ec am f6faa4d2: am ea7c8dcb: am c61aabfa: Merge "Update material colors" into lmp-dev 
* commit 'f6faa4d292186bd5927de59f96cfe7a2cb04156c':
  Update material colors
 2014-08-26 10:17:17 +00:00
Amith Yamasani
6ef47af07d am 0f30cbed: am 19bcfd6e: am e352845e: Merge "Fix toggle button clickability in app restrictions" into lmp-dev 
* commit '0f30cbed1a36c69b368869ec8178e6645973c9b3':
  Fix toggle button clickability in app restrictions
 2014-08-26 10:17:16 +00:00
Alan Viverette
ea7c8dcbda am c61aabfa: Merge "Update material colors" into lmp-dev 
* commit 'c61aabfa22e972a5173d2edc2aa5fd77fb37bdf9':
  Update material colors
 2014-08-25 23:29:01 +00:00
Amith Yamasani
19bcfd6e43 am e352845e: Merge "Fix toggle button clickability in app restrictions" into lmp-dev 
* commit 'e352845ecad452823bb2c3ba1b0eb1abf2e9a442':
  Fix toggle button clickability in app restrictions
 2014-08-25 23:29:00 +00:00
Alan Viverette
c61aabfa22 Merge "Update material colors" into lmp-dev 2014-08-25 23:18:34 +00:00
Alan Viverette
4895df355a Update material colors 
BUG: 17212898
Change-Id: Idb1c391de3c1fb150f06c3cf744780be1404d2e5
 2014-08-25 16:05:50 -07:00
Amith Yamasani
3391321e2f Fix toggle button clickability in app restrictions 
Also fix side padding

Bug: 17159406
Change-Id: Ic1d61d9a4a7ae6f3f7c451405a6e127791edbdaf
 2014-08-25 15:20:34 -07:00
PauloftheWest
3aeb60dc58 am 687d3a58: am 87d8074a: am aa5c7565: Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev 
* commit '687d3a589ea6a9a259454ea7e139143d4d988f91':
  Updated Tethering and portable hotspot to use switches.
 2014-08-25 17:18:52 +00:00
PauloftheWest
87d8074a14 am aa5c7565: Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev 
* commit 'aa5c7565e42efdfa5ae5506a0a9dfd4f05461034':
  Updated Tethering and portable hotspot to use switches.
 2014-08-25 16:55:21 +00:00