PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,400 Commits 1 Branch 0 Tags
0ba35a9b126ae442c4a1f065aa88b0b18bfc28d4
Commit Graph

6314 Commits

Author SHA1 Message Date
Dianne Hackborn
0ba35a9b12 am 8280f115: am d0a94769: am be875db5: Merge "Battery chart fixes." into lmp-dev 
* commit '8280f115ed511100cd981141ee8301ce723d2ceb':
  Battery chart fixes.
 2014-07-17 21:04:17 +00:00
Amith Yamasani
ae2e8795eb am 06c86162: am 26523d28: am f1d56ebb: Merge "Follow split of DISALLOW_TELEPHONY" into lmp-dev 
* commit '06c861629162e097cb4c6f116161cf326261c8e4':
  Follow split of DISALLOW_TELEPHONY
 2014-07-17 21:04:16 +00:00
Amith Yamasani
0847de429a am 5c2ab1ea: am 0e1aaa0c: am d888b543: Revert "Update Location Settings for Enterprise" due to build breakage. 
* commit '5c2ab1ea149276a64171b936b0daee3255c65575':
  Revert "Update Location Settings for Enterprise" due to build breakage.
 2014-07-17 21:04:16 +00:00
Zoltan Szatmary-Ban
9830b3195e am 4d221ca9: am fc9bf4b5: am ca153c55: Update Location Settings for Enterprise 
* commit '4d221ca92e2ea9c94235b33493d2c6adbd8be48a':
  Update Location Settings for Enterprise
 2014-07-17 21:04:11 +00:00
Dianne Hackborn
8280f115ed am d0a94769: am be875db5: Merge "Battery chart fixes." into lmp-dev 
* commit 'd0a947692de3e618fa4ed6a5f7f72c6714e088da':
  Battery chart fixes.
 2014-07-17 20:59:13 +00:00
Amith Yamasani
06c8616291 am 26523d28: am f1d56ebb: Merge "Follow split of DISALLOW_TELEPHONY" into lmp-dev 
* commit '26523d28ad6bd14e30196a990a849c6ba5395177':
  Follow split of DISALLOW_TELEPHONY
 2014-07-17 20:59:08 +00:00
Amith Yamasani
5c2ab1ea14 am 0e1aaa0c: am d888b543: Revert "Update Location Settings for Enterprise" due to build breakage. 
* commit '0e1aaa0cc8a95d014314220c2453c6606f13428b':
  Revert "Update Location Settings for Enterprise" due to build breakage.
 2014-07-17 20:58:49 +00:00
Zoltan Szatmary-Ban
4d221ca92e am fc9bf4b5: am ca153c55: Update Location Settings for Enterprise 
* commit 'fc9bf4b50b343eb112947baa3ae29fa9754bb369':
  Update Location Settings for Enterprise
 2014-07-17 20:57:06 +00:00
Amith Yamasani
d888b543b2 Revert "Update Location Settings for Enterprise" due to 
build breakage.

This reverts commit ca153c55dd.

Change-Id: Id6d6c98e8504f50b1764bcb87052eb567b6284a1
 2014-07-17 18:26:38 +00:00
Fabrice Di Meglio
1fbd1d8e95 am 4f9f25ac: am 9b435f29: Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-dev 
* commit '4f9f25ac6ce72fce54e3ae9b786dcadc28805ce4':
  Fix bug #15702424 add-wifi setting screen has no title
 2014-07-17 18:19:13 +00:00
Chris Craik
f12b150be5 am 7babd055: Merge "Accessibility text contrast control" into lmp-dev 
* commit '7babd05509ea33f507f3525fbe065093d5877779':
  Accessibility text contrast control
 2014-07-17 18:19:12 +00:00
Lifu Tang
7faa77ead0 am 569abb0c: Merge "Avoid removing switch even listener multiple times" into lmp-dev 
* commit '569abb0c25708d4e7fc2cb4b3fe08839e253e211':
  Avoid removing switch even listener multiple times
 2014-07-17 18:16:28 +00:00
PauloftheWest
18099f716c am b64a1f2f: Merge "Added Wifi Assistant Card" into lmp-dev 
* commit 'b64a1f2fde227153510bd9147c05fb31bddd5a14':
  Added Wifi Assistant Card
 2014-07-17 18:16:26 +00:00
Paul Lawrence
a6c75963a3 am 41eb8522: Merge "Make crypt dialogs material" into lmp-dev 
* commit '41eb85226ceaba16a635eb6b9818231008466f24':
  Make crypt dialogs material
 2014-07-17 18:16:24 +00:00
Dianne Hackborn
be875db541 Merge "Battery chart fixes." into lmp-dev 2014-07-17 17:59:02 +00:00
Dianne Hackborn
c19eb361a4 Battery chart fixes. 
When there is no data to show, don't make a crazy collapsed chart.

Also avoid re-creating the chart when scrolling.

And fix various other things.

Change-Id: Ia1895bc7c46e6d830e66f66e66f17726e1e23e3f
 2014-07-17 12:09:54 -07:00
Zoltan Szatmary-Ban
ca153c55dd Update Location Settings for Enterprise 
Find packages of the corporate user and show them
with badged icon on the "Recent location requests" list.

Bug: 15467321
Change-Id: Ib0fdb9f0c811307875296c37bab6d1fbab919022
 2014-07-17 18:47:17 +01:00
Fabrice Di Meglio
2c377382e7 am 4f9f25ac: am 9b435f29: Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-dev 
* commit '4f9f25ac6ce72fce54e3ae9b786dcadc28805ce4':
  Fix bug #15702424 add-wifi setting screen has no title
 2014-07-17 17:03:25 +00:00
Chris Craik
c0cac5fb50 am 7babd055: Merge "Accessibility text contrast control" into lmp-dev 
* commit '7babd05509ea33f507f3525fbe065093d5877779':
  Accessibility text contrast control
 2014-07-17 17:03:23 +00:00
Lifu Tang
cc1c788a8a am 569abb0c: Merge "Avoid removing switch even listener multiple times" into lmp-dev 
* commit '569abb0c25708d4e7fc2cb4b3fe08839e253e211':
  Avoid removing switch even listener multiple times
 2014-07-17 17:01:00 +00:00
PauloftheWest
32e77410c7 am b64a1f2f: Merge "Added Wifi Assistant Card" into lmp-dev 
* commit 'b64a1f2fde227153510bd9147c05fb31bddd5a14':
  Added Wifi Assistant Card
 2014-07-17 17:00:59 +00:00
Paul Lawrence
9d17fc34a5 am 41eb8522: Merge "Make crypt dialogs material" into lmp-dev 
* commit '41eb85226ceaba16a635eb6b9818231008466f24':
  Make crypt dialogs material
 2014-07-17 17:00:58 +00:00
Amith Yamasani
920c57d499 Follow split of DISALLOW_TELEPHONY 
Save both DISALLOW_OUTGOING_CALLS and DISALLOW_SMS together.

Change-Id: I06dd23b3fb4a21f3a22661da17491fc5b0bce4ed
 2014-07-17 11:03:41 -07:00
Fabrice Di Meglio
9b435f29d7 Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-dev 2014-07-16 23:30:53 +00:00
Fabrice Di Meglio
e817a66e83 Fix bug #15702424 add-wifi setting screen has no title 
- pass the missing EXTRA_SHOW_FRAGMENT_TITLE_RESID
- define a new string for the Activity title
- code cleaning: remove a non needed call to getIntent()

Change-Id: I430d59c0225c6e7f23e78edf5644d07ef33a9d98
 2014-07-16 19:51:06 -07:00
Chris Craik
7babd05509 Merge "Accessibility text contrast control" into lmp-dev 2014-07-16 22:04:55 +00:00
Chris Craik
fc72424cd7 Accessibility text contrast control 
b/14624452

Change-Id: I0f6708680eb37cf8e7dc63cae56b639eaf7c8dbd
 2014-07-16 18:04:26 -07:00
Maurice Lam
63d6c905c9 am e6080819: am ca1ad092: Merge "[WifiSetup] Make illustration header not clickable" into lmp-dev 
* commit 'e6080819b046b27a0951dcc6802766c3cf3c30ad':
  [WifiSetup] Make illustration header not clickable
 2014-07-16 17:19:35 +00:00
Maurice Lam
e6080819b0 am ca1ad092: Merge "[WifiSetup] Make illustration header not clickable" into lmp-dev 
* commit 'ca1ad0928064a92b92d72fd1900bde644c398f27':
  [WifiSetup] Make illustration header not clickable
 2014-07-16 17:14:41 +00:00
PauloftheWest
b64a1f2fde Merge "Added Wifi Assistant Card" into lmp-dev 2014-07-16 16:25:13 +00:00
PauloftheWest
060e01a93e Added Wifi Assistant Card 
+ Show Wi-Fi Assistant card above network list that scroll under the action bar with the rest of the list
+ Display a promo image and text
+ Clicking "Setup" should link to the selected Wi-Fi assistant app (must be open to 3rd parties)
+ Touching "No, Thanks" should snooze this card for 30 days / 2nd time 90 / 3rd time 180 days / then forever

Bug: 15703202

Change-Id: If74101bea630246c6bda2de3ed79fee72eca4c0c
 2014-07-16 15:46:09 -07:00
Narayan Kamath
d9124e9344 am 023406a3: am 2abbacb7: Merge "Get rid of duplicated code in accessibility settings." 
* commit '023406a37446630bd4285489e28003834e7f70bc':
  Get rid of duplicated code in accessibility settings.
 2014-07-16 13:13:38 +00:00
Narayan Kamath
023406a374 am 2abbacb7: Merge "Get rid of duplicated code in accessibility settings." 
* commit '2abbacb7d46657e5863eb2ef0035521ffc41a0a8':
  Get rid of duplicated code in accessibility settings.
 2014-07-16 13:08:24 +00:00
Alexandra Gherghina
5503427d9f am 6f877156: Merge "Only show AccountSyncSettings when we have an account" into lmp-dev 
* commit '6f877156e0345dc6a70b513e38cd5a32a97783b9':
  Only show AccountSyncSettings when we have an account
 2014-07-16 12:59:52 +00:00
Fabrice Di Meglio
1ecfa6e336 am fd1415d2: Merge "Fix bug #16319697 ACTION_DEVICE_INFO_SETTINGS intent causes Settings app to crash" into lmp-dev 
* commit 'fd1415d204e4a11a26fe2d550709c0fe42df46ab':
  Fix bug #16319697 ACTION_DEVICE_INFO_SETTINGS intent causes Settings app to crash
 2014-07-16 03:04:46 +00:00
Jeff Davidson
7d4481dbd0 am eda4acbb: Fix excessively long logtag. 
* commit 'eda4acbb499c7e310bcf5e5465a0f0cd1c773204':
  Fix excessively long logtag.
 2014-07-16 03:04:46 +00:00
Jeff Davidson
eda4acbb49 Fix excessively long logtag. 
Change-Id: Idb0846269623550d891d8e98765d630a17da7d14
 2014-07-16 01:51:55 +00:00
Narayan Kamath
26edbccb58 Get rid of duplicated code in accessibility settings. 
Has the side effect of picking up changes to LocalePicker
that added support for 3 letter language codes.

bug: 10090157

Change-Id: I20b357c8a3e76c7cecdf623d9ed39c3751d07645
 2014-07-16 12:54:45 +00:00
Alexandra Gherghina
6f877156e0 Merge "Only show AccountSyncSettings when we have an account" into lmp-dev 2014-07-16 00:46:50 +00:00
Alexandra Gherghina
defdfc54bb Only show AccountSyncSettings when we have an account 
Also removes useless list of accounts

Bug: 16295803
Change-Id: Ida3c1846327874af9f97695a485b12ec689fd343
 2014-07-16 13:27:26 +01:00
Chris Wren
80898f0618 am 62a8aa7a: Merge "Implement application-level high priority setting." into lmp-dev 
* commit '62a8aa7ac90ad28e8f524011480b8b379d0bb50a':
  Implement application-level high priority setting.
 2014-07-15 22:03:32 +00:00
Lifu Tang
42fa973457 Avoid removing switch even listener multiple times 
- Fix b/16118646

Change-Id: I36cdc5c8d98dfb63924737af40efff35b9ca2e66
 2014-07-16 23:12:03 +00:00
Paul Lawrence
41eb85226c Merge "Make crypt dialogs material" into lmp-dev 2014-07-15 20:35:01 +00:00
Paul Lawrence
89c7570dd4 Make crypt dialogs material 
White on black material theme
Center text
Remove fade to black task
Fix emergency call button

Note - does not implement all requirements of frames in the defect. More
to follow.

Bug: 15328359
Change-Id: I878e59dccffff366ba2484bb77482e168cbd2b81
 2014-07-16 08:07:35 -07:00
Maurice Lam
ca1ad09280 Merge "[WifiSetup] Make illustration header not clickable" into lmp-dev 2014-07-15 20:35:01 +00:00
Maurice Lam
5aee7d5c68 [WifiSetup] Make illustration header not clickable 
No more "pop" sound when the illustration is tapped on.

Bug: 16331851
Change-Id: Ib528e1d6f669f71e0c2f24164726cee47b06700b
 2014-07-15 18:24:18 -07:00
Fabrice Di Meglio
fd1415d204 Merge "Fix bug #16319697 ACTION_DEVICE_INFO_SETTINGS intent causes Settings app to crash" into lmp-dev 2014-07-15 20:35:01 +00:00
Fabrice Di Meglio
1b18665dbc Fix bug #16319697 ACTION_DEVICE_INFO_SETTINGS intent causes Settings app to crash 
- fix the way we are passing switchBarMarginStart / switchBarMarginEnd

Change-Id: Ic6e67643be10877a74ae68075460fa5fd4cc5da1
 2014-07-15 18:52:37 -07:00
Chris Wren
62a8aa7ac9 Merge "Implement application-level high priority setting." into lmp-dev 2014-07-15 16:05:17 +00:00
Amith Yamasani
82ed2f5c68 am 04b550e2: Merge "Handle android.settings.HOME_SETTINGS intent" into lmp-dev 
* commit '04b550e27a6fb22bf967be43f6e2b741e9ddd67c':
  Handle android.settings.HOME_SETTINGS intent
 2014-07-15 02:35:40 +00:00