Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,211 Commits 1 Branch 0 Tags
3dd9586175feb993cbc60a6072d6b91035ea5a95
Commit Graph

2414 Commits

Author SHA1 Message Date
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
Jorim Jaggi
2e57c997fe am bbd59cc2: am 21b05211: am a0357604: am 30001127: am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev 
* commit 'bbd59cc252ec037c5b385b2c1c74c39f00e27c49':
  Text changes to assist & voice input
 2015-07-07 00:32:56 +00:00
Jorim Jaggi
ae6e7292fa Text changes to assist & voice input 
Bug: 22063668
Change-Id: I3454f6409d1f5816469505404c77d6a02e53aa50
 2015-07-06 18:49:26 +00:00
Jorim Jaggi
0f4f09c3d3 am 6c8e6503: am ea53bfcd: am d9bd96b3: Add setting to disable screenshot separately (2/2) 
* commit '6c8e6503084845b8923b9a63c300c8f6e3dd519c':
  Add setting to disable screenshot separately (2/2)
 2015-06-30 01:01:18 +00:00
Jorim Jaggi
d9bd96b309 Add setting to disable screenshot separately (2/2) 
Bug: 22063668
Change-Id: I85b255ac114184e0edbd71010d517b337ad935e5
 2015-06-29 14:50:45 -07:00
Akshay Kannan
84e14f296f am bc99d35e: am 2f7fea73: am 5006bf1d: Merge "Language Update for Wi-Fi/Bluetooth Scanning" into mnc-dev 
* commit 'bc99d35e38b83c7f7a19fd2bf591c15618d6161a':
  Language Update for Wi-Fi/Bluetooth Scanning
 2015-06-24 16:34:06 +00:00
Akshay Kannan
5006bf1de7 Merge "Language Update for Wi-Fi/Bluetooth Scanning" into mnc-dev 2015-06-24 15:55:32 +00:00
Lifu Tang
55601622d5 Language Update for Wi-Fi/Bluetooth Scanning 
Bug: 22046234
Change-Id: Iea8fa2368d1e568a8e1fdd3edefa8f4fc6053e48
 2015-06-23 18:54:27 -07:00
Selim Cinek
f3834ed1b5 am c9d3f895: am ae3693d4: am 1726b2c9: Merge "Added contentDescription for fingerprint on the confirmCredential screen" into mnc-dev 
* commit 'c9d3f895295c578652f13b331bec1fe02394224b':
  Added contentDescription for fingerprint on the confirmCredential screen
 2015-06-23 23:17:37 +00:00
Selim Cinek
cf8347b33f Added contentDescription for fingerprint on the confirmCredential screen 
Bug: 21850269
Change-Id: Ia3720451a74e69e119b60121d7906274c522f70a
 2015-06-23 17:48:48 -04:00
Jason Monk
e09535541d am 591aa6ae: am d8c811d8: am b4b590d1: Merge "Update disable dialog" into mnc-dev 
* commit '591aa6ae9ed7bd254df849fd154ce2de70eb60c1':
  Update disable dialog
 2015-06-22 16:07:16 +00:00
Jason Monk
b4b590d13f Merge "Update disable dialog" into mnc-dev 2015-06-22 14:55:14 +00:00
Jason Monk
0591282f2a am 9c4c45b3: am 6a7c7562: am d63e6969: Merge "Add content description to owner info status text" into mnc-dev 
* commit '9c4c45b34013514b4f8a734b3f8d146dc613e46b':
  Add content description to owner info status text
 2015-06-19 16:26:37 +00:00
Jason Monk
2e78f53af1 Add content description to owner info status text 
Bug: 21799551
Change-Id: I8fe82d304309949a5a46492f7d20c58e006baea3
 2015-06-19 11:17:03 -04:00
Brian Carlstrom
be12161f9e am 34e39e7c: am 9dca3951: am 2567514a: Merge "Clarify process_dex2oat_label description" into mnc-dev 
* commit '34e39e7cff699c9fb38c3d92276099ef99e97de8':
  Clarify process_dex2oat_label description
 2015-06-19 14:18:37 +00:00
Sanket Padawe
aac6357744 am 4ad7f625: am aa10a9ec: am 5ba90c14: Increase char limit of the data usage Settings string to 33. 
* commit '4ad7f6254d195bd53369aa7fc5154f70d6fb42c3':
  Increase char limit of the data usage Settings string to 33.
 2015-06-19 14:18:35 +00:00
Brian Carlstrom
2567514abc Merge "Clarify process_dex2oat_label description" into mnc-dev 2015-06-19 04:23:08 +00:00
Sanket Padawe
5ba90c148d Increase char limit of the data usage Settings string to 33. 
Bug: 21801556
Change-Id: I82d99f155a3c4b6f1ac0f3056c254e54b8e5f311
 2015-06-18 18:39:25 -07:00
Brian Carlstrom
972ed7750f Clarify process_dex2oat_label description 
Bug: 21898104
Change-Id: I264f784db761ac51a1dde51f189fb017b7d378b1
 2015-06-18 10:11:18 -07:00
Jason Monk
1b23ef2e59 am beab783c: am 6afa2a51: am ed672cfc: Merge "Revert "Accounts -> Account sync"" into mnc-dev 
* commit 'beab783cfddd8b31e3406cfbaa9b180d553f4a33':
  Revert "Accounts -> Account sync"
 2015-06-18 16:32:55 +00:00
Jason Monk
ed672cfc8c Merge "Revert "Accounts -> Account sync"" into mnc-dev 2015-06-18 15:54:56 +00:00
Jason Monk
06fc34e25a Revert "Accounts -> Account sync" 
This reverts commit 43db745ea0.

Bug: 21726868
Change-Id: I72fd09c493f71a607b9df8eaa8e42047a60303e8
 2015-06-18 15:44:46 +00:00
Jason Monk
53a5d7ff2c Update disable dialog 
Bug: 20826933
Change-Id: Ib84d3ba50ead2b71f62a3b163a5f5ba32a576c00
 2015-06-18 10:46:55 -04:00
Jim Miller
de1d7db439 am 8b5943c2: am dd0d9854: am 4b60af78: Merge "Fix issue with german translation of lock times" into mnc-dev 
* commit '8b5943c2fb4d069797df0c1a4b43f2d604eb6385':
  Fix issue with german translation of lock times
 2015-06-17 00:33:52 +00:00
Jim Miller
4b60af78fa Merge "Fix issue with german translation of lock times" into mnc-dev 2015-06-16 23:59:43 +00:00
Brian Carlstrom
8453e36188 am 99c1009a: am 49d73c03: am 94f4cb4e: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev 
* commit '99c1009a897834e8282a59c0dda8f29dd33234e4':
  dex2oat should show something friendlier in Settings -> Battery
 2015-06-16 23:25:53 +00:00
Jim Miller
50d7d19a73 Fix issue with german translation of lock times 
The word "immediately" would go into a different place in the sentence
than a number so we have to break this into two strings.

Fixes bug 21602326

Change-Id: Ie07f1bc84d68bdea8d6f1264dfd18326c2e48df4
 2015-06-16 16:21:27 -07:00
Brian Carlstrom
94f4cb4e46 Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev 2015-06-16 22:59:04 +00:00
Sanket Padawe
bb9e422c6c am 3c2f469b: am fc4e9cbd: am 7171d686: Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev 
* commit '3c2f469bf9d804bdb60bd0fea618cbc883db5ab6':
  Add PBAP checkbox for BT pairing consent dialog.
 2015-06-16 21:42:47 +00:00
Sanket Padawe
7171d6864f Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev 2015-06-16 15:24:05 +00:00
Jeff Sharkey
eb446accf3 am 96b09cf5: am 3538eb24: am 71c89a17: Merge "More storage UI updates." into mnc-dev 
* commit '96b09cf59f7554b05004fa7f8ad6da1c73e8f545':
  More storage UI updates.
 2015-06-16 05:16:43 +00:00