PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,401 Commits 1 Branch 0 Tags
d9d21d6cb1e435bd46dcd089ecdc11a357dd7cfb
Commit Graph

26401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fan Zhang
d9d21d6cb1 Move actionbar menu from DashboardSummary to container. 
Bug: 27751187
Change-Id: I7730f104805abcbb6d243fccac94e39fad26ddd2
 2016-03-31 15:33:45 -07:00
Udam Saini
6251501ef3 Merge "Prevents users from being added if device is not provisioned" into nyc-dev am: e20deea 
am: 9f7d237

* commit '9f7d2375806bcfc7dc873e51b228e69e57e093b8':
  Prevents users from being added if device is not provisioned

Change-Id: I255f6f284aafc68f66d3a8956c5f9a8ba85525a3
 2016-03-31 20:26:42 +00:00
Udam Saini
9f7d237580 Merge "Prevents users from being added if device is not provisioned" into nyc-dev 
am: e20deea

* commit 'e20deea7112a17ac4799f6924cddc27b4678f791':
  Prevents users from being added if device is not provisioned

Change-Id: Ieb663a2741bce75cd9cebed08f36801a36958e83
 2016-03-31 20:23:24 +00:00
Udam Saini
e20deea711 Merge "Prevents users from being added if device is not provisioned" into nyc-dev 2016-03-31 20:13:40 +00:00
Christopher Tate
a8fe48881e Merge "Track in-progress wallpaper API changes" into nyc-dev am: cb77df2 
am: e714194

* commit 'e7141949edd4c5aeb4366e8e773cc6f16ade2950':
  Track in-progress wallpaper API changes

Change-Id: I6ad24595aee24d5ce3be7e8e230295e9cca6fa2e
 2016-03-31 19:42:42 +00:00
Christopher Tate
e7141949ed Merge "Track in-progress wallpaper API changes" into nyc-dev 
am: cb77df2

* commit 'cb77df22609179aacf985818fd512719f7ea98f7':
  Track in-progress wallpaper API changes

Change-Id: Ia1df1b0dbf5880a94c6c2b6f6d5c3208a951ef40
 2016-03-31 19:35:57 +00:00
Chris Tate
cb77df2260 Merge "Track in-progress wallpaper API changes" into nyc-dev 2016-03-31 19:24:41 +00:00
Robin Lee
a8bf579e34 Merge "DISALLOW_CONFIG_CREDENTIALS blocks user credentials" into nyc-dev am: 4d29ab3 
am: e79fed2

* commit 'e79fed2839bbb70c1df111947208e00833057154':
  DISALLOW_CONFIG_CREDENTIALS blocks user credentials

Change-Id: I53a5b108a62f679e731164a8ac21f121ad21cabf
 2016-03-31 18:59:00 +00:00
Robin Lee
e79fed2839 Merge "DISALLOW_CONFIG_CREDENTIALS blocks user credentials" into nyc-dev 
am: 4d29ab3

* commit '4d29ab31455ae7c7eef91871230e34b3ecc452e1':
  DISALLOW_CONFIG_CREDENTIALS blocks user credentials

Change-Id: I20a82efa39f5116ba3919198418873e794fa5240
 2016-03-31 18:55:32 +00:00
Robin Lee
4d29ab3145 Merge "DISALLOW_CONFIG_CREDENTIALS blocks user credentials" into nyc-dev 2016-03-31 18:44:21 +00:00
Ying Wang
686adfc32f Remove obsolete LOCAL_DX_FLAGS 
Bug: 27400061
Change-Id: Ia65d8ebdbb96d34fe12badc0015716d5d9fde0ca
 2016-03-31 11:16:55 -07:00
Jason Monk
a37aca16ea Merge "Fix missing summaries" into nyc-dev am: 8143d2a 
am: f3a5f79

* commit 'f3a5f7986d41f126d6589296b207285247fb4f8e':
  Fix missing summaries

Change-Id: I6dc00e18687f801a23e12204b7627935bbc90e74
 2016-03-31 18:10:30 +00:00
Jason Monk
f3a5f7986d Merge "Fix missing summaries" into nyc-dev 
am: 8143d2a

* commit '8143d2adb345aefafdaa38ed12ab86b1a5fb0574':
  Fix missing summaries

Change-Id: Ibaaf35f6a429220a8e34621dcf16c4396044c5c5
 2016-03-31 18:04:19 +00:00
Jason Monk
8143d2adb3 Merge "Fix missing summaries" into nyc-dev 2016-03-31 18:00:55 +00:00
Jason Monk
c064573265 Fix missing summaries 
Handle non-cached tiles by doing lookup from component name.

Change-Id: I979e2df2eed4a065f290c5c0e66276d08b4fb0af
Fixes: 27942733
 2016-03-31 13:59:46 -04:00
mariagpuyol
e22810e71a Merge "Use same task for Settings>Users and EmergencyInfo" into nyc-dev am: 6d6ea3f 
am: d0ba082

* commit 'd0ba082ca732b0effe15067d93b22e292a96237c':
  Use same task for Settings>Users and EmergencyInfo

Change-Id: Idbb6fc5505039055825f8118cad1277966c29ae3
 2016-03-31 17:46:39 +00:00
Victor Chang
fc20972456 Merge "Show notification when failing to turn on always-on vpn" into nyc-dev am: b1d7142 
am: 5cffb81

* commit '5cffb81f567009e589e2bbc8ccd3dcae15147f13':
  Show notification when failing to turn on always-on vpn

Change-Id: I2446bb50b8981800e400faf4a04f291b416afd58
 2016-03-31 17:46:38 +00:00
Robin Lee
c421db78f0 DISALLOW_CONFIG_CREDENTIALS blocks user credentials 
All settings preferences related to credentials of any kind should be
stopped by this user restriction.

Bug: 26879958
Change-Id: I983c6e58081bd4022bb006942499cba4b74954e7
 2016-03-31 18:45:43 +01:00
mariagpuyol
d0ba082ca7 Merge "Use same task for Settings>Users and EmergencyInfo" into nyc-dev 
am: 6d6ea3f

* commit '6d6ea3fe0a9aae6159b3eda197cd1d660135c413':
  Use same task for Settings>Users and EmergencyInfo

Change-Id: Ifc596101c4392bb76f2d6038c364560ebc42fefa
 2016-03-31 17:44:34 +00:00
Victor Chang
5cffb81f56 Merge "Show notification when failing to turn on always-on vpn" into nyc-dev 
am: b1d7142

* commit 'b1d7142cb21de23ec9c1dddb824405bf252bffed':
  Show notification when failing to turn on always-on vpn

Change-Id: I76c5ad7c545294edfeb533148ba85cdcdc41dc58
 2016-03-31 17:44:34 +00:00
Maria Garcia Puyol
6d6ea3fe0a Merge "Use same task for Settings>Users and EmergencyInfo" into nyc-dev 2016-03-31 17:38:56 +00:00
Victor Chang
b1d7142cb2 Merge "Show notification when failing to turn on always-on vpn" into nyc-dev 2016-03-31 17:04:53 +00:00
Christopher Tate
25e59e9767 Track in-progress wallpaper API changes 
FLAG_*, not FLAG_SET_*

Bug 27365822

Change-Id: I5cb4dbfd251519a80997a86d3010f19240b9ff23
 2016-03-31 09:56:37 -07:00
Jason Monk
ae130a27c5 Merge "Fix categeries being read out on settings dashboard" into nyc-dev am: 69446e8 
am: d09508b

* commit 'd09508b8fc2c6fd917ab2f69e1014fa96edf2e1d':
  Fix categeries being read out on settings dashboard

Change-Id: I3ffd285de257ed9171a5b0d9f11f61305f22f4bf
 2016-03-31 15:50:46 +00:00
Jason Monk
38587c61fb Merge "Fix cell data preference in single sim case" into nyc-dev am: 04f10a5 
am: e0ec32c

* commit 'e0ec32c26e580b5dca8c1968f20949021d37211f':
  Fix cell data preference in single sim case

Change-Id: I317173dde03aac9d5b5ac0ec9805347a069a6086
 2016-03-31 15:50:46 +00:00
Jason Monk
6de2d0a5a3 Merge changes from topic \'SettingsMetrics\' into nyc-dev am: 50b9592 
am: 5c4e4bc

* commit '5c4e4bcb63bcf01907a0b871b4793a029ddb1968':
  Add metrics for suggestions
  Add metrics for settings conditionals

Change-Id: Ic33116cf8ef78094a026ef61514019769e44e674
 2016-03-31 15:50:44 +00:00
Bill Yi
6a2cf0a28e Merge "Import translations. DO NOT MERGE" into nyc-dev am: 645c198 -s ours 
am: 987b621  -s ours

* commit '987b6211574463a3ed139373dd3e1b241dae64d5':
  Import translations. DO NOT MERGE

Change-Id: I6353e86f3630d5c063eb02adaf1dde58b744603b
 2016-03-31 15:50:43 +00:00
Jason Monk
d09508b8fc Merge "Fix categeries being read out on settings dashboard" into nyc-dev 
am: 69446e8

* commit '69446e80ab95f7d01b7612a02ae35e75d9b5c609':
  Fix categeries being read out on settings dashboard

Change-Id: Ifd3c3ad560969b58557acd86a98eb299d65a4385
 2016-03-31 15:43:28 +00:00
Jason Monk
e0ec32c26e Merge "Fix cell data preference in single sim case" into nyc-dev 
am: 04f10a5

* commit '04f10a5eb53bb1ed3d70574102b94b17e075132d':
  Fix cell data preference in single sim case

Change-Id: I08d74e06819a2d0487149af5bfa40a6124b3100c
 2016-03-31 15:43:28 +00:00
Jason Monk
5c4e4bcb63 Merge changes from topic \'SettingsMetrics\' into nyc-dev 
am: 50b9592

* commit '50b9592e6116f8a6eca5df2753491a7e26ffde6a':
  Add metrics for suggestions
  Add metrics for settings conditionals

Change-Id: I40b107005c6a29a010658de643eb94db769ebcb1
 2016-03-31 15:43:27 +00:00
Bill Yi
987b621157 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 645c198  -s ours

* commit '645c198f3e65427017b53957c025b0b3a94ebe52':
  Import translations. DO NOT MERGE

Change-Id: I5fd25e9853c625ce669b5ea54e2509351eed24b9
 2016-03-31 15:43:27 +00:00
Victor Chang
1b8855b211 Show notification when failing to turn on always-on vpn 
- Notification icon is Settings icon
- VpnName is obtained as the same way as AppPreference
- Post notification as the current user with PendingIntent to VpnSettings to parent user
- Auto-cancel when user taps on the notification
- This implementation posts notification only when the failure happens sychronously
  (Assume ConnectivityService only unset always-on package immediately after calling setAlwaysOnVpnPackageForUser)

Bug:27374485
Change-Id: I0aee38498c8cc300dd8eb9687adcae5f9dc4f8af
 2016-03-31 16:40:22 +01:00
Jason Monk
69446e80ab Merge "Fix categeries being read out on settings dashboard" into nyc-dev 2016-03-31 14:36:45 +00:00
Jason Monk
9c868652ba Fix categeries being read out on settings dashboard 
Change-Id: Ica0eec62a532fa40b57553e8e3d9fba1cba3bd4e
Fixes: 26125682
 2016-03-31 10:35:03 -04:00
Jason Monk
04f10a5eb5 Merge "Fix cell data preference in single sim case" into nyc-dev 2016-03-31 13:56:51 +00:00
Jason Monk
b0bca3c3c1 Fix cell data preference in single sim case 
Change-Id: Ic956d4a7a4935bcdbeaf868f978e23ba11919f9c
Fixes: 27653690
 2016-03-31 09:55:25 -04:00
Jason Monk
50b9592e61 Merge changes from topic 'SettingsMetrics' into nyc-dev 
* changes:
  Add metrics for suggestions
  Add metrics for settings conditionals
 2016-03-31 13:47:32 +00:00
Bill Yi
645c198f3e Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-31 13:23:37 +00:00
Bill Yi
120845909f Merge "Import translations. DO NOT MERGE" 2016-03-31 13:22:49 +00:00
Yohei Yukawa
a255b96253 Merge changes Ieea9a13a,Id2ae6151 into nyc-dev am: 5ffbf2e 
am: b5164e0

* commit 'b5164e04a3b64af95fa3bbfd17d51e26b0a12247':
  Remove gear icon from InputMethodPreference.
  Update title to "Add or edit virtual keyboards".

Change-Id: I8bd9ab786944093f6047f38ee4b3611b5c4211b6
 2016-03-31 06:24:27 +00:00
Yohei Yukawa
b5164e04a3 Merge changes Ieea9a13a,Id2ae6151 into nyc-dev 
am: 5ffbf2e

* commit '5ffbf2e39d8ce5bb4f1256564fe060534541c710':
  Remove gear icon from InputMethodPreference.
  Update title to "Add or edit virtual keyboards".

Change-Id: Ideeeb1062a62ed77a7d178c80469effa0c3ade7c
 2016-03-31 06:21:39 +00:00
Yohei Yukawa
5ffbf2e39d Merge changes Ieea9a13a,Id2ae6151 into nyc-dev 
* changes:
  Remove gear icon from InputMethodPreference.
  Update title to "Add or edit virtual keyboards".
 2016-03-31 06:13:54 +00:00
Bill Yi
6153baa067 Import translations. DO NOT MERGE 
Change-Id: I942bbb8156f204723bf2b421702ecf6a1ddbd7cf
Auto-generated-cl: translation import
 2016-03-30 22:29:47 -07:00
Bill Yi
da7576261b Import translations. DO NOT MERGE 
Change-Id: Ic4e77e1979b46669b31f54f2bf86f31c5f6efb67
Auto-generated-cl: translation import
 2016-03-30 21:41:30 -07:00
Noah Wang
27e624829c Merge "Fix crashing of font size settings screen due to the timing of initialization of ExploreByTouchHelper Bug: 27674946" into nyc-dev am: ca1abaa 
am: 52e0b82

* commit '52e0b820c3e172bdd6128192230aafdad1a8084b':
  Fix crashing of font size settings screen due to the timing of initialization of ExploreByTouchHelper Bug: 27674946

Change-Id: Iafb31dcff999d813bd10d9147d242a2fb0d72e0e
 2016-03-31 02:15:34 +00:00
Noah Wang
52e0b820c3 Merge "Fix crashing of font size settings screen due to the timing of initialization of ExploreByTouchHelper Bug: 27674946" into nyc-dev 
am: ca1abaa

* commit 'ca1abaa9531523d413830f6763963450ba494f8f':
  Fix crashing of font size settings screen due to the timing of initialization of ExploreByTouchHelper Bug: 27674946

Change-Id: I885d01786f73ad794e4e1793390f7dd826b695e9
 2016-03-31 02:13:07 +00:00
mariagpuyol
6ca8940880 Use same task for Settings>Users and EmergencyInfo 
Bug:27859534
Change-Id: I0ea4e56e4f6daacfd478336444aceeb84d8bfe5d
 2016-03-30 18:21:48 -07:00
Daichi Hirono
4bd1684321 Merge "Change the dialog text in USB device tyep chooser." into nyc-dev am: 9856531 
am: 03f89ff

* commit '03f89ff4fabd7b93d3ad7ed4df04ed88363a12cc':
  Change the dialog text in USB device tyep chooser.

Change-Id: I1a84b9946436824abd71519cd192e6262da453da
 2016-03-31 00:40:42 +00:00
Noah Wang
ca1abaa953 Merge "Fix crashing of font size settings screen due to the timing of initialization of ExploreByTouchHelper Bug: 27674946" into nyc-dev 2016-03-31 00:37:02 +00:00
Daichi Hirono
03f89ff4fa Merge "Change the dialog text in USB device tyep chooser." into nyc-dev 
am: 9856531

* commit '9856531b450b6bdc73f0d8f4416661c10d4560ec':
  Change the dialog text in USB device tyep chooser.

Change-Id: Ided54b1ce7d00dcdf028b1d0724eae117a0f4f64
 2016-03-31 00:36:16 +00:00