Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,452 Commits 1 Branch 0 Tags
3cbac3eea4493daf29969f0e4e757eb2db791d1e
Commit Graph

4664 Commits

Author SHA1 Message Date
Fabrice Di Meglio
ed4bec4697 am f54cdcdd: am c63f16ce: am c08c67be: Merge "Fix alignment of ActionBar title and Preferences for tablet UI" into lmp-dev 
* commit 'f54cdcdd36a93f00dc707090f34ee9476210ef99':
  Fix alignment of ActionBar title and Preferences for tablet UI
 2014-07-18 03:14:29 +00:00
Tadashi G. Takaoka
1c88aa8848 am 02d8341c: am 740de4d3: am 3ac7802e: Fix duplicate string resources 
* commit '02d8341ca4dc3db2262eac8ce4bd56de46687655':
  Fix duplicate string resources
 2014-07-18 03:14:28 +00:00
Fabrice Di Meglio
c63f16ce0d am c08c67be: Merge "Fix alignment of ActionBar title and Preferences for tablet UI" into lmp-dev 
* commit 'c08c67be886082c579983beceeac1d935d8e1c3b':
  Fix alignment of ActionBar title and Preferences for tablet UI
 2014-07-18 02:43:49 +00:00
Tadashi G. Takaoka
740de4d39c am 3ac7802e: Fix duplicate string resources 
* commit '3ac7802ee6c8b6d3e1befa7b3c6a970201fc3d24':
  Fix duplicate string resources
 2014-07-18 02:05:45 +00:00
Tadashi G. Takaoka
3ac7802ee6 Fix duplicate string resources 
Change-Id: I33fd2e236f7462fc8a8fd14f56226e21d74a0311
 2014-07-17 18:07:26 -07:00
Michael Wright
9f879c0f24 am 9292e270: am 87b69c30: am b8a90e50: Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev 
* commit '9292e27026bec67f4facd16ce35576b778d208e7':
  Add OP_PROJECT_MEDIA to AppOps
 2014-07-18 00:37:57 +00:00
Paul Lawrence
81b3dd3a9b am 951b69ee: am 2126ac9f: am eb0628bb: Merge "Final touches to material theme for phones" into lmp-dev 
* commit '951b69ee6525cfb09311b488a20e3544e446f665':
  Final touches to material theme for phones
 2014-07-17 23:54:04 +00:00
Michael Wright
87b69c3030 am b8a90e50: Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev 
* commit 'b8a90e5042c0b112a44d7619fd2928bb92a4a6dc':
  Add OP_PROJECT_MEDIA to AppOps
 2014-07-17 22:03:58 +00:00
PauloftheWest
6c023caec0 am e4a04c83: am 995448c7: am 08ee22cb: Merge "Removed extraneous string from strings.xml" into lmp-dev 
* commit 'e4a04c83f5d8928262a5fdc4ff993917d43cd2d5':
  Removed extraneous string from strings.xml
 2014-07-17 21:59:56 +00:00
Fabrice Di Meglio
c08c67be88 Merge "Fix alignment of ActionBar title and Preferences for tablet UI" into lmp-dev 2014-07-17 21:58:28 +00:00
Fabrice Di Meglio
3bd0515242 Fix alignment of ActionBar title and Preferences for tablet UI 
- use the correct start/end padding

See bug: #15439371 Visual add white BG for Settings Detail

Change-Id: I391fb3c75c51349ffbc17295b3aac6f432f91b58
 2014-07-17 19:36:14 -07:00
Paul Lawrence
2126ac9fa1 am eb0628bb: Merge "Final touches to material theme for phones" into lmp-dev 
* commit 'eb0628bb02e5945acc0b5fe9da7082b279f043d6':
  Final touches to material theme for phones
 2014-07-17 21:04:25 +00:00
Michael Wright
b8a90e5042 Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev 2014-07-17 21:04:20 +00:00
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
PauloftheWest
995448c76a am 08ee22cb: Merge "Removed extraneous string from strings.xml" into lmp-dev 
* commit '08ee22cb35eadfdacfbb010fc157b3e5febbdd6e':
  Removed extraneous string from strings.xml
 2014-07-17 19:53:19 +00:00
Dianne Hackborn
d0a947692d am be875db5: Merge "Battery chart fixes." into lmp-dev 
* commit 'be875db541d673aa62dd99acebc523a26018616e':
  Battery chart fixes.
 2014-07-17 19:25:51 +00:00
Paul Lawrence
eb0628bb02 Merge "Final touches to material theme for phones" into lmp-dev 2014-07-17 19:13:40 +00:00
Paul Lawrence
aa05738cd2 Final touches to material theme for phones 
Fix layout
Improve text color/size
Improve edit box look
Hide status bar at top

Bug: 15328359
Change-Id: Ia0ea75c74b352963ccf47db0ff7c9684adc1f2a3
 2014-07-17 13:29:23 -07:00
Alan Viverette
fcb4092248 am a3fb9cea: am 5427b9a7: Update new TimePicker widget to match Settings theme 
* commit 'a3fb9ceacceafd863c49cc958e9b2eb90f27492e':
  Update new TimePicker widget to match Settings theme
 2014-07-17 18:19:14 +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
Andres Morales
c1ddf4e6b5 am 0128374a: Increase oem_unlock_enable char limit for translation 
* commit '0128374aae5f9b748ade7d347fd267969ce726b9':
  Increase oem_unlock_enable char limit for translation
 2014-07-17 18:19:11 +00:00
Fabrice Di Meglio
de2f44c6c5 am b5b35fa1: Merge "Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is crashing again" into lmp-dev 
* commit 'b5b35fa1cf8122dca0f10392e6bfb6ee88f1d7f1':
  Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is crashing again
 2014-07-17 18:18:05 +00:00
PauloftheWest
6da8b0c99a am f3282c50: Merge "Corrected mispelling in strings.xml" into lmp-dev 
* commit 'f3282c500141023508bd1e08fd5cb6913a8e32df':
  Corrected mispelling in strings.xml
 2014-07-17 18:16:27 +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
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
Alan Viverette
a3fb9ceacc am 5427b9a7: Update new TimePicker widget to match Settings theme 
* commit '5427b9a7990d408df1f2231ec649501f848f7d3d':
  Update new TimePicker widget to match Settings theme
 2014-07-17 14:18:35 +00:00
Fabrice Di Meglio
4f9f25ac6c am 9b435f29: Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-dev 
* commit '9b435f29d72d3be25c97ae3234ba375df055d09d':
  Fix bug #15702424 add-wifi setting screen has no title
 2014-07-17 14:15:47 +00:00
Alan Viverette
5427b9a799 Update new TimePicker widget to match Settings theme 
BUG: 11218747
Change-Id: I093e16df14832502af0ac28e19e3ad672a51e1d6
 2014-07-17 04:36:55 +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
PauloftheWest
08ee22cb35 Merge "Removed extraneous string from strings.xml" into lmp-dev 2014-07-17 02:29:54 +00:00
PauloftheWest
44b6f51042 Removed extraneous string from strings.xml 
Change-Id: I68db708eed866f644a2443bdc90582ae3e5c85eb
 2014-07-17 12:49:19 -07:00
Andres Morales
0128374aae Increase oem_unlock_enable char limit for translation 
Bug: 16220494
Change-Id: I3974b241bc57130e518dab4b20348e698a276854
 2014-07-17 01:03:02 +00:00
Fabrice Di Meglio
a874180fbe Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is crashing again 
- regression from 9717fab53d
- add the missing dashboardBackgroundColor attribute to the DialogWhenLarge Themes

Change-Id: I9f7e21d33851966350726e4b3bf79a5a4d12a37f
 2014-07-16 17:02:41 -07:00
Fabrice Di Meglio
b5b35fa1cf Merge "Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is crashing again" into lmp-dev 2014-07-16 23:42:05 +00: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
Baligh Uddin
a1ed7f2f77 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-16 23:30:53 +00:00
Baligh Uddin
c2befed25d Import translations. DO NOT MERGE 
Change-Id: I2e49081933e98dc3109219c21bd737c3e22fd6f7
Auto-generated-cl: translation import
 2014-07-16 18:46:36 -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
PauloftheWest
b97f2efd88 am 4de66531: am 55245894: Merge "Added strings for PBAP and MultiSim" into lmp-dev 
* commit '4de665314a8443f4b8913bc145f1de43144bc168':
  Added strings for PBAP and MultiSim
 2014-07-16 17:53:11 +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
PauloftheWest
f3282c5001 Merge "Corrected mispelling in strings.xml" into lmp-dev 2014-07-16 13:12:22 +00:00
PauloftheWest
7a18c4c4ce Corrected mispelling in strings.xml 
Bug: 16345771
Bug: 16337577

Change-Id: I63912c51b5483d4adbfc70668318cd14c344d244
 2014-07-16 16:13:09 -07:00
Fabrice Di Meglio
5c66753359 am 7d79e418: Fix OwnerInfos 
* commit '7d79e41877440f8447f92652ce7cdc386b214523':
  Fix OwnerInfos
 2014-07-16 03:04:47 +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
Fabrice Di Meglio
7d79e41877 Fix OwnerInfos 
- use a white background for being in line with the Material Theme
- fix padding so that the edge effect is showing full width

See bug: #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: Iea1cf6b104ee8bf5f311f7d3485d0500884dc57a
 2014-07-15 18:55:27 -07:00
Michael Wright
bdf28e4025 Add OP_PROJECT_MEDIA to AppOps 
Bug: 9905068
Change-Id: Ie929cfbe0001f6e6645316ea8b2eca13aab35675
 2014-07-16 00:04:19 +00:00