Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,020 Commits 1 Branch 0 Tags
c2bc3e7dc3dfc8ef3b73b59d0aa07b42816a5e4e
Commit Graph

2303 Commits

Author SHA1 Message Date
John Spurlock
6b600d972d am 541e5c41: am 1b76e790: am 9a583610: Merge "Settings: Update notification listener user prompt strings." into mnc-dev 
* commit '541e5c410cbb87d168faed5da411447390acd63d':
  Settings: Update notification listener user prompt strings.
 2015-06-08 21:39:36 +00:00
John Spurlock
90e27a4893 Settings: Update notification listener user prompt strings. 
Bug: 20926937
Change-Id: I85e1e103511155f854478b773ddc45dc88c96c12
 2015-06-08 16:50:36 -04:00
John Spurlock
05285a4498 am 22684501: am 7db10639: am 178d46a9: Merge "Settings: Update DND access dialog to new user flow." into mnc-dev 
* commit '22684501474d6a3c145b42131c4ad5889fdf6fa4':
  Settings: Update DND access dialog to new user flow.
 2015-06-08 17:15:09 +00:00
Martijn Coenen
0d12ebdc90 am a048b2c7: am 4504eb36: am 1276b213: Merge "Add NFC payment "how it works" screens." into mnc-dev 
* commit 'a048b2c76a2af99a6504ddd24cdedd98d1348f78':
  Add NFC payment "how it works" screens.
 2015-06-08 17:15:07 +00:00
John Spurlock
178d46a9b5 Merge "Settings: Update DND access dialog to new user flow." into mnc-dev 2015-06-08 16:39:33 +00:00
John Spurlock
a00194d998 Settings: Update DND access dialog to new user flow. 
- Only list apps in the DND access list that have included
   the corresponding permission in their manifest.
 - Show a scary user warning before enabling access per app.
 - Update manifest to follow framework intent action rename.

Bug: 21621663
Change-Id: I76c6893928092bdbb58d62bc3aba31ec8a609fc6
 2015-06-08 12:27:03 -04:00
Martijn Coenen
1276b21317 Merge "Add NFC payment "how it works" screens." into mnc-dev 2015-06-08 08:02:30 +00:00
Sanket Padawe
dca52b023d am 7e7376bf: am ca324f5a: am 547089c3: Merge "Fix wifi network strings shown in Settings." into mnc-dev 
* commit '7e7376bf757c54e892bf963810101a0237b4dc4f':
  Fix wifi network strings shown in Settings.
 2015-06-06 17:05:17 +00:00
Sanket Padawe
547089c376 Merge "Fix wifi network strings shown in Settings." into mnc-dev 2015-06-06 01:58:20 +00:00
Sanket Padawe
2816e4e3e0 Fix wifi network strings shown in Settings. 
Bug: 21575915
Change-Id: I09d938aa03790119ebf6dc28fb6e00accab7d11d
 2015-06-05 18:49:12 -07:00
Ruben Brunk
823ea696c7 am 2585210c: am bf493816: am e35df2ff: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 
* commit '2585210c8da69c8882f8f86fd3273d5f623248fd':
  Add UI for camera + flashlight battery reporting.
 2015-06-06 00:41:12 +00:00
Ruben Brunk
e35df2ff3b Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 2015-06-06 00:04:19 +00:00
Ruben Brunk
2627190bac Add UI for camera + flashlight battery reporting. 
Bug: 11694505
Change-Id: Idca51a2e8cc7c2fb3e9d10f84f94e66600dee6fa
 2015-06-05 16:05:18 -07:00
Martijn Coenen
cbcc76e8d3 Add NFC payment "how it works" screens. 
Bug: 21239081
Bug: 21305138
Bug: 21305420
Change-Id: Ic9ea1b7e9b842299f2fb6b26f61a927855981e67
 2015-06-05 21:35:55 +02:00
John Spurlock
11d500c9d1 am dec8f810: am afa64f45: am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev 
* commit 'dec8f8107c13a0a6f0ff4e8d65139eb139a20850':
  Settings: Add zen rule name warning text.
 2015-06-04 16:16:16 +00:00
John Spurlock
1a1181edde Merge "Settings: Add zen rule name warning text." into mnc-dev 2015-06-04 15:41:58 +00:00
John Spurlock
7b4d1e2cb8 Settings: Add zen rule name warning text. 
Bug: 21307309
Change-Id: Id08e3bdebb9a87dc474f2551f17268d655c8b4ea
 2015-06-04 11:37:36 -04:00
Stuart Scott
9a8933ab5f am 9eb4d103: am 01a6351f: am fcf64237: Merge "Re-add a string which was accidently removed." into mnc-dev 
* commit '9eb4d103450b3a6d2682f0ff8d5f8806518ae058':
  Re-add a string which was accidently removed.
 2015-06-04 01:28:13 +00:00
Stuart Scott
fcf64237b7 Merge "Re-add a string which was accidently removed." into mnc-dev 2015-06-04 00:51:17 +00:00
Stuart Scott
1da842af41 Re-add a string which was accidently removed. 
bug:20051165
Change-Id: I43214f30650565499ffbdddb3819e96ac957ebf1
 2015-06-03 17:01:42 -07:00
Barnaby James
3571671d99 am 6a441e2a: am fc32d510: am ef0b4362: Merge "Fix TTS for Zen mode voice activity." into mnc-dev 
* commit '6a441e2aba09d350df4834e21d72c43afaea8634':
  Fix TTS for Zen mode voice activity.
 2015-06-03 19:23:43 +00:00
Barnaby James
ef0b43625c Merge "Fix TTS for Zen mode voice activity." into mnc-dev 2015-06-03 17:09:56 +00:00
Jason Monk
44cf2f9f39 am 75059f1a: am b77a8177: am 0d2eea38: Merge "Change name of search menu item to be more descriptive" into mnc-dev 
* commit '75059f1ac43c536eba3a281270a432ec235778cc':
  Change name of search menu item to be more descriptive
 2015-06-01 20:20:20 +00:00
Jason Monk
0d2eea38bf Merge "Change name of search menu item to be more descriptive" into mnc-dev 2015-06-01 19:45:27 +00:00
Jason Monk
e5d14dc606 Change name of search menu item to be more descriptive 
(for accessibility)

Bug: 20345352
Change-Id: Id8c74f4bf3753dc36153965923859315ecc07a9a
 2015-06-01 15:21:07 -04:00
Stuart Scott
47ed6ca004 Network Reset should have a lockdown like Factory Reset. 
bug:20332322
Change-Id: I645ad0d226869042c11225630e4de5968ebb7a0d
(cherry picked from commit 176f512c5a)
 2015-06-01 16:30:48 +00:00
Fyodor Kupolov
963da2b1e4 am aeaf219e: am 8a1683f2: am 01f35ce4: Merge "Use DimmableIconPreference for Add user action" into mnc-dev 
* commit 'aeaf219eaebb6c0c541a0f701553ee0225d89794':
  Use DimmableIconPreference for Add user action
 2015-06-01 15:48:20 +00:00
Fyodor Kupolov
01f35ce46e Merge "Use DimmableIconPreference for Add user action" into mnc-dev 2015-05-29 20:42:55 +00:00
Jason Monk
6e76f98f06 am eb859db1: am 5ab0c9c9: am a7fe759d: Merge "More memory updates" into mnc-dev 
* commit 'eb859db14fbb0b7050d518edade44409ef213743':
  More memory updates
 2015-05-28 15:05:02 +00:00
Jason Monk
ab2046aa76 More memory updates 
- Some string changes
 - Make processes in memory details not clickable
 - Put processes in a 'detail' category
 - Hide processes when an app only has 1
 - Add memory item to bottom of app info page

Bug: 20694769
Change-Id: Ifbe2205aeef230e44752d075578524249b30bdf8
 2015-05-28 10:20:56 -04:00
Jason Monk
bae05490bb am 4562d9f5: am 4b34804b: am 51334310: Add no data usage string 
* commit '4562d9f57a904560c8f43500ccdf99b42d533e7f':
  Add no data usage string
 2015-05-27 14:30:18 +00:00
Jason Monk
51334310a2 Add no data usage string 
Add a no data usage string so we can avoid showing incorrect dates
when no data is available.

Bug: 21076561
Change-Id: I4568cd750fe5f973fed0ff4ffa48412d8c6afd97
 2015-05-27 09:02:16 -04:00
Jason Monk
e224c39795 am 1737c2e5: am 5b1c0329: am 7231147b: Merge "Unbanish memory screen and new UX" into mnc-dev 
* commit '1737c2e5ef093a4db2ec1ede8ad523e62ce1f61f':
  Unbanish memory screen and new UX
 2015-05-26 17:28:16 +00:00
Jason Monk
beb171d2e5 Unbanish memory screen and new UX 
Give memory screen a makeover so that it looks nice enough to be
restored to its rightful home.

Bug: 20694769
Change-Id: I2f6933037b3fbbfb0d9fe5e3ca821ef59e171faa
 2015-05-26 11:41:37 -04:00
Barnaby James
c54782071a Fix TTS for Zen mode voice activity. 
Don't finish activity until TTS has finished.
Incorrect TTS for mix of hours / mins - e.g. 1 hour 45 minutes.
Improve the description of TTS strings for translators.

BUG: 20248251
BUG: 21413212
BUG: 21411622

Change-Id: Id2693ea82b76492216147012216ba07ce75a9d12
 2015-05-24 12:30:21 -07:00
Jason Monk
cc6e9ae9c7 am 2821a373: am cf55da1e: am b2f11d01: String changes for app links in settings 
* commit '2821a373edf50b054e8a68565dbec5a3774dbb56':
  String changes for app links in settings
 2015-05-22 21:41:59 +00:00
Jason Monk
b2f11d013c String changes for app links in settings 
Bug: 21372846
Change-Id: I76cc684c8f8f42555af36f754291d6ba99acb4e4
 2015-05-22 14:42:45 -04:00
Stuart Scott
176f512c5a Network Reset should have a lockdown like Factory Reset. 
bug:20332322
Change-Id: I645ad0d226869042c11225630e4de5968ebb7a0d
 2015-05-22 10:19:53 -07:00
Maurice Lam
ee127ed133 am 21deee07: am 03d12996: am 51eec32a: Merge "[LockScreenSetup] Move retry button to top" into mnc-dev 
* commit '21deee07ee972066aeb0daf6f636618df23364e8':
  [LockScreenSetup] Move retry button to top
 2015-05-21 22:33:32 +00:00
Jorim Jaggi
ee96ed2613 am 6cbad01c: am c8f78ec9: am 19ea8b70: Merge "Fix string for fingerprint settings" into mnc-dev 
* commit '6cbad01c0b0cd145cc531b813e4541885148b457':
  Fix string for fingerprint settings
 2015-05-21 22:07:17 +00:00
Maurice Lam
51eec32afa Merge "[LockScreenSetup] Move retry button to top" into mnc-dev 2015-05-21 21:55:48 +00:00
Jorim Jaggi
19ea8b7034 Merge "Fix string for fingerprint settings" into mnc-dev 2015-05-21 21:23:57 +00:00
Maurice Lam
a9a04efe89 [LockScreenSetup] Move retry button to top 
Move retry button to top, under the subheader, and change the label
to "Clear". Also hide the footer textView since all footer labels are
currently empty.

Bug: 20916604
Change-Id: I7915a132945687815dbb16ce0a60207cc02eed2b
 2015-05-21 03:04:11 +00:00
Sean Francis-Lyon
d502e97e6c removing google specific language from aosp strings 
Change-Id: I2787f8390adcb5dfd6098ee0f1bf50bb51f3f349
 2015-05-20 11:29:36 -07:00
Fyodor Kupolov
a7a7bfe59f Use DimmableIconPreference for Add user action 
Moved DimmableIconPreference from location to the root package since it is
now used in several places.

Add user action now uses DimmableIconPreference. Added a new summary string,
which is displayed when no more users can be added.

Bug: 20892920
Change-Id: I00b00f80ba8933a00a2de85777b9f7e55d03c31b
 2015-05-19 16:44:13 -07:00
Jorim Jaggi
3099997b46 Fix string for fingerprint settings 
Also adjust fingerprint enrollment animation to spec.

Bug: 21030545
Change-Id: I937e4ea7ab4a51fa0b57b8b4c6b3038453d8f05e
 2015-05-19 14:10:05 -07:00
Jeff Sharkey
d0393cd041 Merge "Warn user when adopted device is slow." into mnc-dev 2015-05-19 19:03:35 +00:00
Jeff Sharkey
0de2014380 Warn user when adopted device is slow. 
For now, warn user if benchmark takes longer than a simple threshold
of 2 seconds.

Bug: 21172095
Change-Id: I6d43ee93ac2ff669115519e6a856f8c314915a47
 2015-05-19 12:00:56 -07:00
Jorim Jaggi
a2138a3485 Merge "Add setting to disable assist data (2/2)." into mnc-dev 2015-05-19 04:40:10 +00:00
Jorim Jaggi
bc38a9a0ab Add setting to disable assist data (2/2). 
Bug: 20944446
Change-Id: I3c518176cab88ce9b5031a0241bee30240e6f896
 2015-05-18 21:38:45 -07:00