Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,580 Commits 1 Branch 0 Tags
236d7625e4e4ea47b6bce19bb5636e36b32ce368
Commit Graph

2444 Commits

Author SHA1 Message Date
Julia Reynolds
7b37a563ce am 89594f52: am 61bc6b72: am 24a1ac36: am c2f62f65: am 00b5488c: Merge "Change assist app warning message text" into mnc-dev 
* commit '89594f520ad0b59dd58ea67cd788d6ee63485fdb':
  Change assist app warning message text
 2015-07-29 22:02:33 +00:00
Julia Reynolds
5bdf80c868 Change assist app warning message text 
Bug: 22816916
Change-Id: I43259ab526710fd193a16c6cb49580042dca8555
 2015-07-29 13:02:09 -04:00
Julia Reynolds
77f4d053d6 am 9062cdba: am 826400bd: am f2d5e02c: am 39768c86: am f889faaf: Merge "Bump string char limit." into mnc-dev 
* commit '9062cdba945cbb493df54b5a7ab61a514283d0e0':
  Bump string char limit.
 2015-07-29 13:55:08 +00:00
Julia Reynolds
f889faaf08 Merge "Bump string char limit." into mnc-dev 2015-07-29 12:25:28 +00:00
Martijn Coenen
f299787f32 am 25f86b0f: am 120ed352: am b0390ed0: am de661d5b: am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev 
* commit '25f86b0fafc1c9d656ce8aab305137c41662b037':
  Fix tap & pay strings.
 2015-07-29 11:04:34 +00:00
Martijn Coenen
8e7b9cf9f6 Merge "Fix tap & pay strings." into mnc-dev 2015-07-29 07:54:04 +00:00
Jorim Jaggi
c19d2be9de am 2f975b53: am 1e652aa0: am e0120a8e: am cc5c7809: am 730389bd: Merge "Adjust choose assist app string" into mnc-dev 
* commit '2f975b534dd1acd3a2e5414a36e2e25af1586c07':
  Adjust choose assist app string
 2015-07-28 18:47:21 +00:00
Julia Reynolds
5dadca81eb Bump string char limit. 
Bug: 19561615
Change-Id: I605becd30c0bece146a57995a0cd416d1c55c837
 2015-07-28 13:39:24 -04:00
Martijn Coenen
b637ba08ad Fix tap & pay strings. 
Bug: 22534220
Bug: 22762332
Change-Id: Ifd98a6cf0490b6dd59cc6a0957db45509d6fd1d7
 2015-07-28 16:37:39 +02:00
Selim Cinek
b812ead9a8 am e8619653: am c79a8ee8: am 73f601d6: am 01b2d812: am 95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev 
* commit 'e861965343c8fe4a25d874d1198fef5f7764148c':
  Adapted a string in the fingerprint enrollment flow
 2015-07-28 03:47:17 +00:00
Jorim Jaggi
730389bd82 Merge "Adjust choose assist app string" into mnc-dev 2015-07-28 00:39:12 +00:00
Jorim Jaggi
66664bea91 Adjust choose assist app string 
Bug: 22512392
Change-Id: Ibbaacd505139dcabfca07554e93bd1d3aacc861f
 2015-07-27 14:53:48 -07:00
Selim Cinek
95ddf90349 Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev 2015-07-27 20:57:23 +00:00
Jason Monk
936734f5c1 am 74129926: am ebefd240: am f0b615de: am b322fdf5: am 08cb3983: Merge "Update battery optimization strings" into mnc-dev 
* commit '7412992651fa92ffe68dc4f76f4c7fdc17021614':
  Update battery optimization strings
 2015-07-27 19:01:39 +00:00
Jason Monk
c9eba1f253 Update battery optimization strings 
Bug: 22687961
Change-Id: I039a781a0c3db991cbe4ad7d3e6246cc5cb1cbfa
 2015-07-27 12:29:25 -04:00
Adrian Roos
81ce2ea882 am 2f00f2c8: am 8fee8176: am b87428a6: am 5ada0050: am 38c9b9eb: Update FRP warning to spec 
* commit '2f00f2c84a8e0f99c7ccb35157a63128ec98c19a':
  Update FRP warning to spec
 2015-07-25 16:54:16 +00:00
Adrian Roos
38c9b9eb5e Update FRP warning to spec 
Bug: 22672924
Change-Id: Ie275d5099553539707f86bf0e8cec5d5022ad227
 2015-07-24 15:09:34 -07:00
Selim Cinek
b48e9fdcab Adapted a string in the fingerprint enrollment flow 
Bug: 22634070
Change-Id: Ieefae6a6d23c22ea6719ccf8d843638bc92b4376
 2015-07-23 15:29:01 -07:00
Maurice Lam
760c4f1b5d [Fingerprint] Add strings for fingerprint during SUW 
Bug: 22630959
Change-Id: I81aeb498f11bd27d56983776fd36fdbf38f25883
 2015-07-22 11:21:31 -07:00
Billy Lau
2e407c317a am 90bc96f8: am f7011298: am bc3695c2: am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev 
* commit '90bc96f83dcfe84e697b8a8370488442665ce9e2':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
 2015-07-21 18:51:31 +00:00
Billy Lau
bb3aa2632a Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)... 
Overall, fixed the detection of the state of permission in the corresponding
UX to be more accurate. Also ensured that apps needing this capability can
launch the summary UX through a specific intent.

AndroidManifest:
Adds the proper intent-filter so that apps can launch the Settings page using
intent.

strings.xml:
Increased the CHAR limits for some strings due to requests from translators.

Change-Id: Ie64f86e034867ed582c1c583a5e8f84671fa4d63
 2015-07-21 17:44:49 +01:00
Maurice Lam
fed7de4546 am d0577460: am 3234f0b9: am c690d199: am d5af0d8b: am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev 
* commit 'd05774600e5ac86cb883041abfb5b407afa04fd3':
  [ScreenLock] Change title of encryption interstitial
 2015-07-21 01:47:32 +00:00
Maurice Lam
a5d2be8683 am 6e512e08: am b8c09951: am e82793a2: am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev 
* commit '6e512e0815c8678621077008498f18e73402ecc3':
  [Fingerprint] Change message in encryption
 2015-07-21 01:37:07 +00:00
Maurice Lam
9a93dfa8cb am d7615bba: am ec2f7fe5: am 135c8869: am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev 
* commit 'd7615bbaacf6c7dc4ae91e0921cfb2f5987c73bc':
  [ScreenLock] Change title for RedactionInterstitial
 2015-07-21 01:37:06 +00:00
Maurice Lam
d85fafce30 Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev 2015-07-21 00:38:39 +00:00
Maurice Lam
d10026cbfd Merge "[Fingerprint] Change message in encryption" into mnc-dev 2015-07-21 00:25:16 +00:00
Maurice Lam
af57ec8831 Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev 2015-07-21 00:22:03 +00:00
Maurice Lam
5cceb312fd [ScreenLock] Change title for RedactionInterstitial 
Change the title for RedactionInterstital to "Notifications".

Bug: 22587892
Change-Id: Ib0e32fa8913924ae74aa412703a5f6234fd62fe4
 2015-07-20 23:42:52 +00:00
Maurice Lam
15546c0b9d [ScreenLock] Change title of encryption interstitial 
Change the title of EncryptionInterstitial to "Secure start-up".

Bug: 22587892
Change-Id: I30b9625bb2da666cd5e229445ad369fe72faad51
 2015-07-20 15:23:41 -07:00
Maurice Lam
c0e7879684 [Fingerprint] Change message in encryption 
Change the message for encryption interstitial when enrollin
fingerprint, to make it clear that fingerprint unlock is still used,
just that the backup unlock PIN / password / pattern will be needed
to start the device.

Bug: 22559146
Change-Id: Ia134e0d9b118151833a9118ff44667dcc9122185
 2015-07-20 21:52:12 +00:00
Christopher Tate
d2dcd30acd am 99e89859: am ef1961c7: am 7cce6d0c: am f330857a: am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev 
* commit '99e8985959682c510e7e2fac210768e2471b4b26':
  Offer 'ask' as an available app-linking state
 2015-07-20 18:38:23 +00:00
Christopher Tate
b852fcbde9 Merge "Offer 'ask' as an available app-linking state" into mnc-dev 2015-07-20 17:06:27 +00:00
Christopher Tate
2eda36509f Offer 'ask' as an available app-linking state 
Bug 22532193

Change-Id: I5bb43b1b8d84af1901f99fb10dd899c260d94c99
 2015-07-17 16:11:41 -07:00
Billy Lau
6897d6978e am 81e050aa: am 28f35248: am e5a95396: am e104fced: am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev 
* commit '81e050aad01c15484fe4e262c53475bd13c4782b':
  Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
 2015-07-17 19:52:38 +00:00
Billy Lau
f8f9802104 Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)... 
Overall, fixed the detection of the state of permission in the corresponding UX
to be more accurate. Also ensured that apps can actually launch the summary UX
through a custom intent.

AndroidManifest:
Adds the proper intent-filter so that apps can launch the Settings page using
intent.

strings:
Made changes to strings so that wordings are uniform everywhere and raised the
char limit due to requests from translators.

Change-Id: Ia03403641ad53bd1a33b84dae6db1739cfcf9d60
 2015-07-17 18:23:57 +01:00
Xiaohui Chen
c49c26bf04 Merge "sys user split: refactor user settings" 2015-07-16 16:16:20 +00:00
Jason Monk
4904f3cbaf am bfa8e5d5: am 5d780aa9: am f9d8deff: am 7beb763d: am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev 
* commit 'bfa8e5d53b53a9accbf567f986b625c9ac473f35':
  Change move storage from dropdown pref to dialog
 2015-07-16 00:04:43 +00:00
Jason Monk
e8400c2fb7 Change move storage from dropdown pref to dialog 
Use a horizontal pref and a single button that triggers the dialog

Bug: 21922660
Change-Id: Ifb4de75ca9269d2e8163eec5602932260adec0d9
 2015-07-15 16:59:28 -04:00
xinhe
9c43d78421 am 5c9874ce: am 53d67679: am 9d95d884: am 7e23bae6: am d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev 
* commit '5c9874cefd9bc35c191c85a7744734b0a90a055c':
  Need to disable 5GHz bands for WiFi tethering in Japan
 2015-07-15 00:04:00 +00:00
xinhe
d7fb46de59 Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev 2015-07-14 22:29:32 +00:00
xinhe
cbdcca6cf6 Need to disable 5GHz bands for WiFi tethering in Japan 
b/22396383

Change-Id: I99090f28eff1b232ebba89ff638e37be82a3f21b
 2015-07-14 14:39:43 -07:00
Billy Lau
5742b87e5c am 509f2fe5: am bd5ae865: am 254ce51b: am de784e6a: am 52df60d8: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev 
* commit '509f2fe51c84e2c0c2d83770710dc8572d0c2223':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
 2015-07-14 19:39:17 +00:00
Billy Lau
52df60d83d Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev 2015-07-14 18:22:30 +00:00
Billy Lau
7f70ba18e6 Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an 
explicit toggle to be enabled through Settings via Apps -> Advanced Apps.

Added new and refactored an old xml to define the UX for two new Preferences
in Advanced Settings. Modified the existing AdvancedAppSettings to add
control flow for two new settings. Also enriched ManageApplications to
handle these cases. Added additional strings in xml/values/strings.xml
to support these settings. Also defined new classes to handle these the
toggle of these permissions per app.

Refactored codes from AppStateUsageBridge to a generic AppStateAppOpsBridge so
that future usages related to AppOps can inherit from this class.

Change-Id: I43b81282a063e05844c7805556a6d05cfc02bcdb
 2015-07-13 22:39:49 +01:00
Rubin Xu
46175909ed am 6e2c1c2e: am bd2e045e: am a383b02c: am 8b9a9519: am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev 
* commit '6e2c1c2e68f6ff40c7201550446e29c8411154b7':
  Remove unused MediaFormat activity
 2015-07-10 19:47:04 +00:00
Rubin Xu
331b9823d0 Merge "Remove unused MediaFormat activity" into mnc-dev 2015-07-10 18:47:51 +00:00
Xiaohui Chen
64f530c2f1 sys user split: refactor user settings 
BUG:19913735
Change-Id: I11e0c728d45bd74b60db89f352b356e97b755651
 2015-07-09 15:31:39 -07:00
Rubin Xu
af43d4ddb4 Remove unused MediaFormat activity 
As part of cleanup of ExternalStorageFormatter.
Bug: 9433509

Change-Id: I4d2bca544e00a549d8c136713da59d07648b9ffe
 2015-07-09 21:29:11 +01:00
Julia Reynolds
8abecf1bb9 am e124fabb: am e10b32ba: am 1bde3259: am df778e8e: am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev 
* commit 'e124fabbf3a17791d59e76723d7a466a1a7bd756':
  Talkback improvements for Settings screens.
 2015-07-09 20:10:05 +00:00
Julia Reynolds
ce25af4838 Talkback improvements for Settings screens. 
Bug: 21164141
Change-Id: I7444261ccf967f6db70c9fe44a00bd3f19ceb975
 2015-07-09 13:21:20 -04:00