PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,174 Commits 1 Branch 0 Tags
cbcc76e8d32f95690d08258a91d58136cd9fb056
Commit Graph

20174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
483d7989de am ff095ab0: am 189d7e8e: Merge "Add Europe/Istanbul timezone" 
* commit 'ff095ab05bc6660abd38d9de047ac467c2d070fc':
  Add Europe/Istanbul timezone
 2015-04-02 17:50:21 +00:00
Elliott Hughes
ff095ab05b am 189d7e8e: Merge "Add Europe/Istanbul timezone" 
* commit '189d7e8e5151cc8774f4c7eb1b00e8efabdc627f':
  Add Europe/Istanbul timezone
 2015-04-02 17:40:44 +00:00
Elliott Hughes
189d7e8e51 Merge "Add Europe/Istanbul timezone" 2015-04-02 17:19:27 +00:00
Samuel Asteberg
7019943855 Add Europe/Istanbul timezone 
Change-Id: I522107e7aead4d7ec587a19202af23df71d16d83
 2015-04-02 18:18:24 +02:00
Adrian Roos
43a0cbad1b Merge "Add default emergency app setting" 2015-04-02 15:22:59 +00:00
Adrian Roos
9c86a7adae Add default emergency app setting 
Bug: 19841649
Change-Id: I1763ee16e1e10c957261fe663f4c87269adcdef7
 2015-04-02 17:21:35 +02:00
Chris Wren
19fb677a58 Merge "provide better instructions for adding settings views." 2015-04-02 14:15:46 +00:00
Chris Wren
20c3093679 provide better instructions for adding settings views. 
And provide a ready default constant.

Change-Id: I76c9ee50af5d97f9f83be7b0eb862f73fc9bfa7b
 2015-04-02 09:38:41 -04:00
Jim Miller
e3107164d5 Merge "Prepare to make Fingerprint API public." 2015-04-02 03:09:57 +00:00
Etan Cohen
96c47d45e7 Merge changes from topic 'mwd-merge-040115' 
* changes:
  Merge commit '279cb4a' into merge
  Merge commit '898e486' into merge
  Merge commit 'fc75374' into merge
  Merge commit '2241607' into merge
  Merge commit 'fe47522' into merge
 2015-04-02 03:07:52 +00:00
Elliott Hughes
1321412c79 am 14083abb: am 144c48e7: am 49fe5084: Merge "add Recife timezone" 
* commit '14083abbe9fa5966f3abb718e19132c18861fb76':
  add Recife timezone
 2015-04-02 02:59:40 +00:00
Elliott Hughes
14083abbe9 am 144c48e7: am 49fe5084: Merge "add Recife timezone" 
* commit '144c48e72736ce9617dfa15331262c13819a17e6':
  add Recife timezone
 2015-04-02 02:33:26 +00:00
Jim Miller
595982d2c3 Prepare to make Fingerprint API public. 
- moved fingerprint support files into hardware area
- moved jni into services/core

Bug 16487912

Change-Id: Id111ee89771fc208a9365fd06c57b3dbf85b5356
 2015-04-01 19:08:09 -07:00
Elliott Hughes
144c48e727 am 49fe5084: Merge "add Recife timezone" 
* commit '49fe5084f73821906572f60bd542ca5042cb794d':
  add Recife timezone
 2015-04-02 01:13:17 +00:00
Elliott Hughes
49fe5084f7 Merge "add Recife timezone" 2015-04-01 23:55:55 +00:00
Geoff Mendal
2814482924 Merge "Import translations. DO NOT MERGE" 2015-04-01 12:26:33 +00:00
Geoff Mendal
c6c8b291d1 Import translations. DO NOT MERGE 
Change-Id: I461162761644acfebe4b32ef6e00476acb7e2988
Auto-generated-cl: translation import
 2015-04-01 05:37:29 -05:00
Zoltan Szatmary-Ban
c38245f93a Merge "Add PRIMARY_PROFILE_CONTROLLED to Settings > App activity manifests" 2015-04-01 10:03:50 +00:00
Etan Cohen
9093b6eba2 Merge commit '279cb4a' into merge 2015-03-31 12:40:41 -07:00
Vinit Deshpande
05075242db Enable UI for EAP-SIM/AKA/AKA' 
We hide identity field for these; since dynamic
identities are now supported.

Change-Id: I5c6816b005ffbcdfa9aad953f5167d3dfd9de055
 2015-03-31 12:36:35 -07:00
Zoltan Szatmary-Ban
de7d498832 Add PRIMARY_PROFILE_CONTROLLED to Settings > App activity manifests 
This is necessary since the introduction of unified view of managed and
primary apps on that screen.

Bug: 20007125
Change-Id: I20872570563c6248bac6591ba8ab83a730b2e49b
 2015-03-31 20:13:25 +01:00
Stuart Scott
bc695c770a Merge "Move reset network settings into framework." 2015-03-31 18:57:09 +00:00
Etan Cohen
d2416fc652 Merge commit '898e486' into merge 2015-03-31 11:52:28 -07:00
Etan Cohen
93b316d883 Merge commit 'fc75374' into merge 
Change-Id: I92f58e88c33e44e9c6da813ae6a58c3846b52c29
 2015-03-31 11:51:54 -07:00
Etan Cohen
7caa77e40c Merge commit '2241607' into merge 2015-03-31 11:26:54 -07:00
Etan Cohen
0ef5c998f2 Merge commit 'fe47522' into merge 2015-03-31 11:26:45 -07:00
Jason Monk
25512e82a5 Update string description to be more clear. 
Bug: 20000920
Change-Id: I393591ecdedb5dc87b4adb9b2e0a684738bcccee
 2015-03-31 13:02:18 -04:00
Stuart Scott
73281fbcfe Move reset network settings into framework. 
bug: 16161518
Change-Id: I7d62201758e97bf08117183429a7acfa13b74994
 2015-03-30 18:00:41 -07:00
Jason Monk
701e55f4c0 Merge "Add permissions screen to advanced apps" 2015-03-30 19:54:24 +00:00
Chris Wren
f22e8c4c2e log wifi actions from settings 
To start:
  enable
  disable
  forget
  connect
  add

Depends-On: I60163e44602b8e23b643b9103c324fa0e0d2c4c4
Change-Id: I52f40298db63f410ced2dbf5ba05d3ad098a85a2
 2015-03-30 14:33:27 -04:00
Jason Monk
9a64a4215e Show current screen lock as summary 
Bug: 19819290
Change-Id: Iefdacd6b86f96e6f3577351e7f92b86217b1b7ad
 2015-03-30 11:00:36 -04:00
Jason Monk
2f41aa7955 Add permissions screen to advanced apps 
Add a screen that shows a list of permissions and how many apps
have been granted them, link to PackageInstaller for control of
the permissions.

Depends on I68cdbe53177f742daf396f4eb53761fd5cda2636
Change-Id: I183848ea89ea41a17eaf663441dc4ef963be99bf
 2015-03-30 10:39:29 -04:00
Geoff Mendal
ec5a3373db Import translations. DO NOT MERGE 
Change-Id: I27d243fa4d6ef7c0cb916a242d595cf48bf5e11d
Auto-generated-cl: translation import
 2015-03-30 08:16:32 -05:00
Stuart Scott
0c2f82ca4e Merge "Forget Wifi SSID" 2015-03-27 23:21:33 +00:00
Alan Viverette
40b55b1d33 Merge "Fix switch bar theme, clean up text appearances" 2015-03-27 23:16:15 +00:00
Geoff Mendal
1e63f8434c Import translations. DO NOT MERGE 
Change-Id: Ic235d2ba6215cbcf6850d8e7fab2a405311b7d32
Auto-generated-cl: translation import
 2015-03-27 15:14:21 -07:00
Lifu Tang
a369820002 Merge "Made scanning settings searchable" 2015-03-27 19:51:46 +00:00
Lifu Tang
ff6d4894e8 Made scanning settings searchable 
Bug: 19965598

Change-Id: I2868bc2185d56861f5a0927bb8d49d978e99f33b
 2015-03-27 12:39:40 -07:00
Chris Wren
8a963babe2 log visibility of views 
Depends-On: I5b1dccb5d103ece3112acf38889bae16273b092f
Change-Id: I116aed2bb805f723a5bf2ec9eb94257de0b4a7b5
 2015-03-27 13:39:07 -04:00
Alan Viverette
fd05a78a03 Fix switch bar theme, clean up text appearances 
Change-Id: Ica2577ecfce61270bc38ea4a22d37f7e37f0b1bc
 2015-03-27 10:23:45 -07:00
Jason Sams
096abbf56a am 57f132d0: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev 
* commit '57f132d0862369899e937664c45f35e220db4cf7':
 2015-03-27 02:01:05 +00:00
Stuart Scott
58bf2e41a2 am 1730be6f: am 7b6bd4d8: am 6b08e11e: am 53eec9fa: Fix sim notifications. 
* commit '1730be6f29771cb1bfa25dae66e1f508b30fbef9':
 2015-03-27 02:01:02 +00:00
Jason Sams
57f132d086 Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev 2015-03-27 01:24:58 +00:00
Stuart Scott
1730be6f29 am 7b6bd4d8: am 6b08e11e: am 53eec9fa: Fix sim notifications. 
* commit '7b6bd4d8c5c59663468ef0e17e8ebf31fd63c06d':
 2015-03-27 01:10:27 +00:00
Stuart Scott
7b6bd4d8c5 am 6b08e11e: am 53eec9fa: Fix sim notifications. 
* commit '6b08e11ef979cd8eb47d91be262c08fc3813bd7f':
 2015-03-27 00:50:43 +00:00
Stuart Scott
6b08e11ef9 am 53eec9fa: Fix sim notifications. 
* commit '53eec9faad4f96497ab5cccaadb05963c3694363':
  Fix sim notifications.
 2015-03-27 00:34:46 +00:00
Stuart Scott
e35a5bab32 Forget Wifi SSID 
Change-Id: I6d4bf3117d92567f89a8eedf41a430ee5342b6c6
 2015-03-26 11:47:36 -07:00
Jason Monk
390910b333 Merge "Fix managed profile bugs in manage apps list" 2015-03-26 12:40:44 +00:00
Jason Monk
1f4f30cd06 Fix managed profile bugs in manage apps list 
- Uses the same package manager flags as secondary users for managed
   profiles, so that owner apps don't show up.

 - Fixes bug in getting AppEntries that caused app info for profile
   apps to get the owner one instead (which was unbadged and very
   broken).

Bug: 19817357
Change-Id: I659ab1081c68a231330f5b16486abc5a0a5b2029
 2015-03-26 08:35:02 -04:00
Vinit Deshpande
279cb4a590 Merge "Fix settings UI for passpoint networks" into m-wireless-dev 2015-03-25 22:42:00 +00:00