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

26347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Daichi Hirono
9856531b45 Merge "Change the dialog text in USB device tyep chooser." into nyc-dev 2016-03-30 23:59:05 +00:00
Mihai Nita
8adce9368b Merge "Fix missing dot in the remove language confirmation message" into nyc-dev am: 627d0af 
am: 7df8853

* commit '7df885353afd6dbe8133c4f65678301ac705bf56':
  Fix missing dot in the remove language confirmation message

Change-Id: Ia729047f2606de48cab8f71696db50867f5d63f5
 2016-03-30 22:52:42 +00:00
Mihai Nita
7df885353a Merge "Fix missing dot in the remove language confirmation message" into nyc-dev 
am: 627d0af

* commit '627d0af541b1cc008c69db5f68a402914bd21971':
  Fix missing dot in the remove language confirmation message

Change-Id: I2bb5ca2e567adb04bb8f66a067cb71fe33c46b97
 2016-03-30 22:48:29 +00:00
Mihai Niță
627d0af541 Merge "Fix missing dot in the remove language confirmation message" into nyc-dev 2016-03-30 22:37:53 +00:00
Mihai Nita
632a311c35 Fix missing dot in the remove language confirmation message 
Bug: 27709559
Change-Id: Ie0f4ecf01578a1f6317b058dfed288dcbfa28d92
 2016-03-30 14:55:30 -07:00
Noah Wang
a0c429a1b6 Merge "Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82" into nyc-dev am: 74df3ec 
am: 3859720

* commit '38597204cb0a77fb05a1b4d51386db10842d8520':
  Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82

Change-Id: I6d180d1d44799046fadbbde7f2f4a743bf1762cc
 2016-03-30 21:53:05 +00:00
Noah Wang
38597204cb Merge "Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82" into nyc-dev 
am: 74df3ec

* commit '74df3ec00247ea18ccf43c466e26dfe1a4622162':
  Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82

Change-Id: Ieb2a3374987ae69f8305aa0b03a94f907d4a4061
 2016-03-30 21:48:50 +00:00
Anna Galusza
8054164f98 Merge "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" into nyc-dev am: d2a686f 
am: 1b48ca5

* commit '1b48ca589b967725339c16eaeabce33cb8213b99':
  Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406

Change-Id: Ib0ebaa392d37cd343ca8bf6338c9abaa467bac51
 2016-03-30 21:48:48 +00:00
Anna Galusza
1b48ca589b Merge "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" into nyc-dev 
am: d2a686f

* commit 'd2a686fbc21959d8324e03c87ec106aa0583e912':
  Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406

Change-Id: Ia2e96a42b719a4dfe9bff8f59ae0b2a183170a45
 2016-03-30 21:43:40 +00:00
Noah Wang
74df3ec002 Merge "Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82" into nyc-dev 2016-03-30 21:41:42 +00:00
Anna Galusza
d2a686fbc2 Merge "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" into nyc-dev 2016-03-30 21:39:05 +00:00
Noah Wang
abf6312b8d Make preview screens in font/display size settings scrollable 
Bug: 27274145
Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82
 2016-03-30 14:32:32 -07:00
Amith Yamasani
4cb667f036 Merge "Don\'t prompt twice to uninstall updates" into nyc-dev am: 8df0415 
am: 251b5a9

* commit '251b5a9a63f7b8144f9b04dc3bc595a0599c5fc3':
  Don't prompt twice to uninstall updates

Change-Id: I869bf5c84fadb15c8365dcc1b3252bebb795adc2
 2016-03-30 20:57:19 +00:00
Amith Yamasani
251b5a9a63 Merge "Don\'t prompt twice to uninstall updates" into nyc-dev 
am: 8df0415

* commit '8df04151d0461ce1520043eb74943f67f9a74aa8':
  Don't prompt twice to uninstall updates

Change-Id: I35169cfa6a2936638309b23a76c5bcd636df6dc9
 2016-03-30 20:50:43 +00:00
Amith Yamasani
8df04151d0 Merge "Don't prompt twice to uninstall updates" into nyc-dev 2016-03-30 20:43:03 +00:00
Jason Monk
9c30c2a76e Merge "Fix wifi animation issues" into nyc-dev am: b9b1c08 
am: a3ceb5a

* commit 'a3ceb5ab5665557ce7213c0ab89c7cdb7e49a9d9':
  Fix wifi animation issues

Change-Id: I188c7e981bf18f7e7a163e2edfc85b1c50082b74
 2016-03-30 20:38:04 +00:00
Jason Monk
a3ceb5ab56 Merge "Fix wifi animation issues" into nyc-dev 
am: b9b1c08

* commit 'b9b1c083e4bd59e17e29d9b5de4b8fed0a754fb6':
  Fix wifi animation issues

Change-Id: I33fda33647e5f9f05af4c57da538836a48bc6e3c
 2016-03-30 20:33:39 +00:00
Jason Monk
b9b1c083e4 Merge "Fix wifi animation issues" into nyc-dev 2016-03-30 20:24:19 +00:00
Jason Monk
85da859392 Fix wifi animation issues 
There are still some remaining animation issues on the wifi screen.
To avoid regressions from M, just disable animations on the entire
wifi screen.

Change-Id: Iabf8ace731638ae7af483c6f3887ca351b17ac60
Fixes: 26271353
 2016-03-30 16:22:39 -04:00
Udam Saini
dd114078f4 Merge "Wait for fingerprints to be removed (Partial fix)." into nyc-dev am: 1f361c2 
am: 2a488fc

* commit '2a488fc54010a827082de2aa3d4308ab9ddbf30f':
  Wait for fingerprints to be removed (Partial fix).

Change-Id: I5f08ac6701ec12f4329e1974dd4acc15661f2966
 2016-03-30 20:17:33 +00:00
Udam Saini
2a488fc540 Merge "Wait for fingerprints to be removed (Partial fix)." into nyc-dev 
am: 1f361c2

* commit '1f361c25e09ee07dd0babb4e7b9a8d3720f0ca31':
  Wait for fingerprints to be removed (Partial fix).

Change-Id: If4d49cc787554adf56451cff0fb7239e4dda9318
 2016-03-30 20:13:18 +00:00
Noah Wang
f6df3bcc58 Merge "Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035" into nyc-dev am: 1308bd8 
am: 825b050

* commit '825b0506ff116f850ca81758700281da2b248b8f':
  Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035

Change-Id: I4ef8fea79b756cc902415c456b6c850c18f4eb15
 2016-03-30 20:10:47 +00:00
Noah Wang
277081a3f5 Merge "Set minimum height for preview screen of font/display size settings Bug: 27699996" into nyc-dev am: bcf590c 
am: 88bb01d

* commit '88bb01d96f0a955a8366a7610363f959e2f71d8d':
  Set minimum height for preview screen of font/display size settings Bug: 27699996

Change-Id: I57d61b0fffc8e4425e9d2348917d5aa385e1546b
 2016-03-30 20:10:46 +00:00
Noah Wang
825b0506ff Merge "Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035" into nyc-dev 
am: 1308bd8

* commit '1308bd8bb1f1223c57a867246542ec22d7f9ef53':
  Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035

Change-Id: I73c5c49f685670b7a5f91c46dde0ac693f1d5fa2
 2016-03-30 20:06:33 +00:00
Noah Wang
88bb01d96f Merge "Set minimum height for preview screen of font/display size settings Bug: 27699996" into nyc-dev 
am: bcf590c

* commit 'bcf590c88ad07865f20e5b1500f3815c03a32cb9':
  Set minimum height for preview screen of font/display size settings Bug: 27699996

Change-Id: I2875bbb371f8426aac82b13c8be871476cc43200
 2016-03-30 20:06:33 +00:00
Udam Saini
1f361c25e0 Merge "Wait for fingerprints to be removed (Partial fix)." into nyc-dev 2016-03-30 20:05:45 +00:00
Noah Wang
1308bd8bb1 Merge "Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035" into nyc-dev 2016-03-30 20:03:38 +00:00
Noah Wang
bcf590c88a Merge "Set minimum height for preview screen of font/display size settings Bug: 27699996" into nyc-dev 2016-03-30 20:03:13 +00:00
Jason Monk
d39dee89cb Merge "Fix keywords for default home app" into nyc-dev am: c6aa18b 
am: 22e2ee8

* commit '22e2ee8638a057b5fe6e1683b4b3d3e02fd60210':
  Fix keywords for default home app

Change-Id: I7e1efd4a23a8c1b9db50ab254e792b184d17acfb
 2016-03-30 19:28:16 +00:00
Jason Monk
1589002d97 Merge "Only show enabled/disabled filters in main app list" into nyc-dev am: 800c912 
am: 99d3d5c

* commit '99d3d5ccf2ab7d7acfab7d6ee1af7818edccd624':
  Only show enabled/disabled filters in main app list

Change-Id: I11bcdc9761574e853bb930fc946ec3877ea81014
 2016-03-30 19:28:16 +00:00
Jason Monk
22e2ee8638 Merge "Fix keywords for default home app" into nyc-dev 
am: c6aa18b

* commit 'c6aa18bcd96ba5085153ad46bcf187dfe3c009f5':
  Fix keywords for default home app

Change-Id: I5dcdafcba6be8549d8ee874b131d99532959adbb
 2016-03-30 19:21:44 +00:00
Jason Monk
99d3d5ccf2 Merge "Only show enabled/disabled filters in main app list" into nyc-dev 
am: 800c912

* commit '800c912f7a8ade7cb9fd501c97c57bd946b4374d':
  Only show enabled/disabled filters in main app list

Change-Id: I986446866b88a744efe20102466b568f24614d54
 2016-03-30 19:21:43 +00:00
Jason Monk
c6aa18bcd9 Merge "Fix keywords for default home app" into nyc-dev 2016-03-30 19:11:18 +00:00
Jason Monk
d2c753f0fb Fix keywords for default home app 
Change-Id: I38851f70d34168f906cf9b7223772bb3442852db
Fixes: 27826745
 2016-03-30 15:09:20 -04:00
Jason Monk
800c912f7a Merge "Only show enabled/disabled filters in main app list" into nyc-dev 2016-03-30 18:53:32 +00:00
Jason Monk
4a25f35680 Only show enabled/disabled filters in main app list 
Change-Id: I8d7c94098b71f5893b08786a4caa90d9c191da99
Fixes: 27921850
 2016-03-30 14:51:52 -04:00
Jason Monk
7681482f6d Merge "Fix bridged app list saved scroll state" into nyc-dev am: a9537a5 
am: df22fc5

* commit 'df22fc52a253d98ba0f180931b2f1a5c2daa359a':
  Fix bridged app list saved scroll state

Change-Id: I31e6244f057306306fd66af003fcb1cc1380bb98
 2016-03-30 17:48:27 +00:00
Muyuan Li
3777014881 Intent to start app memory usage page. am: ba115af 
am: b69a359

* commit 'b69a359f49dc5b474f6f313558042b377bf3aaa4':
  Intent to start app memory usage page.

Change-Id: I87f7252ee1e0d637b26afa037e5678af09c53cfd
 2016-03-30 17:48:27 +00:00
Jason Monk
df22fc52a2 Merge "Fix bridged app list saved scroll state" into nyc-dev 
am: a9537a5

* commit 'a9537a57d59a1b79b999655494af713048f051e9':
  Fix bridged app list saved scroll state

Change-Id: Ia28306bc196abd0764bde0e40c4dd928a5d2aafa
 2016-03-30 17:44:07 +00:00
Muyuan Li
b69a359f49 Intent to start app memory usage page. 
am: ba115af

* commit 'ba115afd52dea0c2db6966748d4cb3b9ff262880':
  Intent to start app memory usage page.

Change-Id: I8ab11e9ed73b668ba47752bc87a578c9237b0e35
 2016-03-30 17:44:07 +00:00
Jason Monk
a9537a57d5 Merge "Fix bridged app list saved scroll state" into nyc-dev 2016-03-30 17:26:55 +00:00
Jason Monk
228638019d Fix bridged app list saved scroll state 
(don't clear the list when we have the info)

Fixes: 27185911
Change-Id: Ieda4fd0fc6dd662741da9a1805c1435d4473490d
 2016-03-30 13:26:30 -04:00
Muyuan Li
ba115afd52 Intent to start app memory usage page. 
Start the app with intent: android.settings.APP_MEMORY_USAGE will bring
up this page.

Bug: 26820467
Change-Id: I50690c71e8182735ea14fdf42a4812573f650e1b
(cherry picked from commit b816812a4f68a1841703da5d29b32ccafd0896f6)
 2016-03-30 17:13:22 +00:00
Jason Monk
6e20cd86b2 resolve merge conflicts of 4038f15 to master 
Change-Id: Ifae7060ab23ad7619a5fdd01315a2d3e7c8a3845
 2016-03-30 12:58:09 -04:00
Amith Yamasani
bacc708f96 Don't prompt twice to uninstall updates 
PackageInstaller is going to ask again, so skip
asking in Settings when user wants to uninstall
updates to a system app.

Bug: 26694521
Change-Id: I4335a4e9bfe54985eb58ba19a890caba06705bef
 2016-03-30 09:52:33 -07:00
Jason Monk
4038f15af3 Merge "Fix sim pin settings" into nyc-dev 
am: aafabba

* commit 'aafabbabab3771b89944ea2a7aea2b4f7b8ba071':
  Fix sim pin settings

Change-Id: I26a86f87522a50933d8d7a293b1b3c9089043f4c
 2016-03-30 16:43:54 +00:00
Jason Monk
36b12b7e63 Merge "Revert "Rename more to other networks"" into nyc-dev am: fd91887 
am: 79a6273

* commit '79a6273c314ead12890a43dba7fd5287614ed35b':
  Revert "Rename more to other networks"

Change-Id: I5d9f42aceab52dc108e6141e92bf629f440f6441
 2016-03-30 16:39:51 +00:00
Jason Monk
aafabbabab Merge "Fix sim pin settings" into nyc-dev 2016-03-30 16:36:26 +00:00