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

1660 Commits

Author SHA1 Message Date
Adam Lesinski
f174153e84 am 3a2a4720: am 3becea17: am 8d7be7b7: Update Settings to use new UsageStats API 
* commit '3a2a4720c175b0dfacace18bade0f99b09e056f4':
  Update Settings to use new UsageStats API
 2014-07-20 02:27:45 +00:00
Adam Lesinski
8d7be7b738 Update Settings to use new UsageStats API 
Change-Id: I89740d9b0c21f1ac6aa68feedc7730dd98b244c9
 2014-07-18 14:35:54 -07:00
PauloftheWest
2e6e981518 am e25fcbf1: am 72e4a85b: am 772cf206: Merge "Minor string fixes for translation" into lmp-dev 
* commit 'e25fcbf1f4eebf2aa588522f5d9aa248e77a8e0e':
  Minor string fixes for translation
 2014-07-18 19:05:05 +00:00
PauloftheWest
772cf20616 Merge "Minor string fixes for translation" into lmp-dev 2014-07-17 21:58:28 +00:00
PauloftheWest
60105a966a Minor string fixes for translation 
Bug: 16321903
Bug: 16321706
Bug: 16321066
Bug: 16321704
Change-Id: I65d0d8c89a8d0e7bf2ff2280aab32cd63b9fe369
 2014-07-18 11:04:13 -07:00
Tadashi G. Takaoka
3ac7802ee6 Fix duplicate string resources 
Change-Id: I33fd2e236f7462fc8a8fd14f56226e21d74a0311
 2014-07-17 18:07:26 -07:00
Amith Yamasani
a81d42e77f am 0e62c43d: am 66926227: am d0a057cc: Merge "Improvements to user settings" into lmp-dev 
* commit '0e62c43d72c1c66c6f9790c8771d5e2c465d8f75':
  Improvements to user settings
 2014-07-18 15:10:35 +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
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
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
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
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
Amith Yamasani
d0a057ccc8 Merge "Improvements to user settings" into lmp-dev 2014-07-17 17:59:02 +00:00
Amith Yamasani
c16b73e92b Improvements to user settings 
Exiting guest mode from within guest user.
Updated assets and cleaned up/optimized some asset clipping code.

Bug: 15761851
Bug: 16355550
Change-Id: I431e92bac3cbedd46bd1e33cffc4d9f0c576ca69
 2014-07-17 20:22:08 -07: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
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
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
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
PauloftheWest
95619db072 Added strings for PBAP and MultiSim 
Bug: 16345619
Change-Id: If7165312723316d5fd90a441562617e03023b015
 2014-07-16 10:38:44 -07:00
PauloftheWest
e60b6a8c18 am 97ed6faa: Merge "Changed text "NFC & More" to "More" and other minor text changes" into lmp-dev 
* commit '97ed6faa702201d2173bf2199805659080b83112':
  Changed text "NFC & More" to "More" and other minor text changes
 2014-07-15 17:05:53 +00:00
PauloftheWest
24377a2780 am 55edbae8: Numerous additional strings needed for translation. 
* commit '55edbae88f3dca9da9b3de676a62ddd614f9a291':
  Numerous additional strings needed for translation.
 2014-07-15 17:05:52 +00:00
PauloftheWest
55edbae88f Numerous additional strings needed for translation. 
Bug: 16288110
Change-Id: I0701f90f4444700a12f68a2f44598326e94a08ec
 2014-07-15 07:27:24 -07:00
Russell Brenner
94364f9c16 am 6ecd6aa8: Merge "Setup Wizard string refresh" into lmp-dev 
* commit '6ecd6aa8cba6b6b578606a1aa274e6960b7f0b79':
  Setup Wizard string refresh
 2014-07-15 02:35:41 +00:00
Russell Brenner
6ecd6aa8cb Merge "Setup Wizard string refresh" into lmp-dev 2014-07-15 00:41:06 +00:00
Russell Brenner
dbe1283da0 Setup Wizard string refresh 
Update strings from UX flows in time for string freeze deadline.

Bug: 16299032
Change-Id: I37e8ccc7197ff08d5f7eba835276c745f13e5487
 2014-07-15 01:10:53 +00:00
PauloftheWest
97ed6faa70 Merge "Changed text "NFC & More" to "More" and other minor text changes" into lmp-dev 2014-07-15 00:22:01 +00:00
PauloftheWest
4181d73b02 Changed text "NFC & More" to "More" and other minor text changes 
Bug: 16298245
Change-Id: Id2bf3fc10523372a4f22d1298b57d62a2cc781cc
 2014-07-15 07:44:37 -07:00
PauloftheWest
d74c812140 Merge "Adding strings for Call Manager do not merge" into lmp-dev 2014-07-15 00:17:34 +00:00
PauloftheWest
2b4cf0561c Adding strings for Call Manager do not merge 
Bug: 16300328
Change-Id: Iac23de5a8668e9f5a4e96225ab48330f10cb1499
(cherry picked from commit da43612e4b)
 2014-07-14 23:41:20 +00:00
PauloftheWest
6c5ef39135 Numerous additional strings needed for translation. do not merge 
Bug: 16288110
Change-Id: I84621b00da52dcee9eb8c24e92a41ccc7f7a6bd1
(cherry picked from commit 90887e656c)
 2014-07-14 23:27:29 +00:00
PauloftheWest
3d009cad14 Changed wording from "Mobile" to "Cellular" do not merge 
Bug: 15720445
Change-Id: Ibfd196d80be030b694473faa24b746536daa3107
(cherry picked from commit 7325abcd62)
 2014-07-14 22:39:15 +00:00
PauloftheWest
da43612e4b Adding strings for Call Manager 
Bug: 16300328
Change-Id: Iac23de5a8668e9f5a4e96225ab48330f10cb1499
 2014-07-14 16:37:58 -07:00
PauloftheWest
90887e656c Numerous additional strinegs needed for translation. 
Bug: 16288110
Change-Id: I84621b00da52dcee9eb8c24e92a41ccc7f7a6bd1
 2014-07-14 16:17:14 -07:00
Jason Monk
4767d5259d am f43bbeb2: Revert "Add lock-to-app to settings" 
* commit 'f43bbeb247fdcdbf8fdc6b5ffbd437797a99ce6b':
  Revert "Add lock-to-app to settings"
 2014-07-14 21:49:22 +00:00
Jason Monk
f43bbeb247 Revert "Add lock-to-app to settings" 
This reverts commit 315070d58b.

Change-Id: Id78311a4e0f371a87c975cc97587a404e0dfdb7f
 2014-07-14 16:44:56 +00:00
PauloftheWest
7325abcd62 Changed wording from "Mobile" to "Cellular" 
Bug: 15720445
Change-Id: Ibfd196d80be030b694473faa24b746536daa3107
 2014-07-14 07:55:14 -07:00
PauloftheWest
ca17156229 Reworded message asking permission to turn on Bluetooth 
Bug: 15829167
Change-Id: I99f27f31664b7363d0f5268ecd5fbcc864dfd989
 2014-07-14 06:49:26 -07:00
PauloftheWest
059a70fdc0 Numerous minor updates for Bluetooth Settings 
+ Remove top "this device" item from the list
+ Upon opening Bluetooth settings, cue a search for available, pair-ready devices
+ Upon opening Bluetooth settings, make the phone/tablet visible to other devices
+ Keep phone/tablet visible as long Bluetooth settings is open and screen is on
+ Filter this list so that only pair-ready devices are displayed
+ Add non-interactive text “<Device name> is now visible to nearby devices” at the bottom of the available devices list

Overflow menu:
- Remove “visibility timeout”
+ Replace “Search for devices” with “Refresh”

Bug: 15716927

Change-Id: I7c5225784af9bfb48dde511e05503ddc59be2b2b
 2014-07-11 16:52:47 -07:00