PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,843 Commits 1 Branch 0 Tags
d27fab15103117ab838aeb1c0eb488a013eeaa83
Commit Graph

27843 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maurice Lam
da19cc42f7 Merge "[Fingerprint] Update strings" into nyc-dev am: 498ec55ba3 am: b5e80b1c56 
am: a752547483

* commit 'a752547483243ca7dee041faa8f373dd676ce48f':
  [Fingerprint] Update strings

Change-Id: I2c471b8f6eaa457063b4b9ed87e74cc6f7967f42
 2016-04-21 22:28:48 +00:00
Android Build Merger (Role)
0da23fd0cb Merge "Merge "[Fingerprint] Update strings" into nyc-dev am: 498ec55ba3 am: 2ad9f41310" into nyc-mr1-dev-plus-aosp 2016-04-21 22:26:52 +00:00
Maurice Lam
9e71bea21a Merge "[Fingerprint] Update strings" into nyc-dev am: 498ec55ba3 
am: 2ad9f41310

* commit '2ad9f41310754cc61d2c8ab55674ccdaefb904bf':
  [Fingerprint] Update strings

Change-Id: I3ac0227fc6cfc061c031fe7cfb11f26d6e025cca
 2016-04-21 22:26:45 +00:00
Maurice Lam
a752547483 Merge "[Fingerprint] Update strings" into nyc-dev am: 498ec55ba3 
am: b5e80b1c56

* commit 'b5e80b1c5609e9b0c27d19504426a4f978f8c4f2':
  [Fingerprint] Update strings

Change-Id: I778275d60ea567a899406c9467c7196228388991
 2016-04-21 22:26:38 +00:00
Maurice Lam
b5e80b1c56 Merge "[Fingerprint] Update strings" into nyc-dev 
am: 498ec55ba3

* commit '498ec55ba3cc06515d9f19e4990771ce36734206':
  [Fingerprint] Update strings

Change-Id: I99bcc81112e55e8c1d6802ce7537d49c8aa1b081
 2016-04-21 22:24:28 +00:00
Maurice Lam
2ad9f41310 Merge "[Fingerprint] Update strings" into nyc-dev 
am: 498ec55ba3

* commit '498ec55ba3cc06515d9f19e4990771ce36734206':
  [Fingerprint] Update strings

Change-Id: I9f57efcaea6d856589f0cb1cce37db34f156a7f6
 2016-04-21 22:24:13 +00:00
Felipe Leme
a5bc4a5d8a Removed obsolete preference. 
BUG: 22817899
Change-Id: Ie2af7d5582db62caf4937b8db3df8784b293a331
 2016-04-21 15:16:14 -07:00
Philip P. Moltmann
eb01628ba8 Update print jobs appropriately in the print settings. 
- Always use a fresh print job as once the print job goes away it cannot
  be read. Before we were stuck with the last state which might not been
  the last state
- make loaders relative to fragment to avoid loader id duplications with
  other ids of the activity.

Fixes: 28315242
Change-Id: I57eeb64b44b5d77b2092c22b175407131f7baf97
 2016-04-21 15:16:05 -07:00
Maurice Lam
498ec55ba3 Merge "[Fingerprint] Update strings" into nyc-dev 2016-04-21 22:06:04 +00:00
Mihai Nita
e356b03606 Merge "Settings: change the TTS text to use the current locale" into nyc-dev am: b1cdea67a5 am: 8225f4eeb1 
am: d3be403652

* commit 'd3be403652e78568d2b984269bf364497f775cd7':

Change-Id: I7f091d30461695ba99fe92509c8b2d9d8f6164c1
 2016-04-21 20:25:51 +00:00
Mihai Nita
a920a31196 Merge "Settings: change the TTS text to use the current locale" into nyc-dev am: b1cdea67a5 am: 093817bd23 
am: 59368baca7

* commit '59368baca700e813f3a35334925b2168f3a3c8f7':
  Settings: change the TTS text to use the current locale

Change-Id: I13f0f019e784f2832af597371d1b1acf11e63bac
 2016-04-21 20:25:50 +00:00
Amit Mahajan
75bbf7bcaa Merge "Merge "Fix ApnSettings crash issue." into nyc-dev am: afdcb6a78e am: 33c6972453" into nyc-mr1-dev-plus-aosp 
am: 80219b3060

* commit '80219b30608859ab2cb88ea81082d6f662a1045c':

Change-Id: I0d1a702b337039e58dbc5ff01a9608e1a99acf32
 2016-04-21 20:25:50 +00:00
yifan.bai
d9dc35c0a1 Merge "Fix ApnSettings crash issue." into nyc-dev am: afdcb6a78e am: c91589bddf 
am: db6cedcfe7

* commit 'db6cedcfe7643d17e8dc71e1ba81a9bad4676810':
  Fix ApnSettings crash issue.

Change-Id: I0bc65723fab3a9d7d47f0a123e599f54eb3a717c
 2016-04-21 20:25:49 +00:00
Robin Lee
0ac236461a Merge changes Ibac27ee1,I336aeefd into nyc-dev am: e2ae135d3c am: 69f12b6e6f 
am: eaad6d7fcc

* commit 'eaad6d7fcc4e4382db58f2c76df29af0dcdc5cda':

Change-Id: Ifecc4290f23f6035c411a94e249145d79147acf8
 2016-04-21 20:25:48 +00:00
Robin Lee
02ba0a13a3 Merge "resolve merge conflicts of 04c7dc2 to master" 2016-04-21 20:16:06 +00:00
Mihai Niță
d3be403652 Merge "Settings: change the TTS text to use the current locale" into nyc-dev am: b1cdea67a5 
am: 8225f4eeb1

* commit '8225f4eeb1bd8d5c3102d70a60ec0db9b729068d':

Change-Id: I7631bd9250506f40e292c72d17aa5b05a59885fb
 2016-04-21 20:07:33 +00:00
Mihai Niță
59368baca7 Merge "Settings: change the TTS text to use the current locale" into nyc-dev am: b1cdea67a5 
am: 093817bd23

* commit '093817bd237dd757db150689a8acdc5d75feeecc':
  Settings: change the TTS text to use the current locale

Change-Id: I962d11edeb49d1caa814a9f96248d0094a4223be
 2016-04-21 20:05:36 +00:00
Mihai Nita
8225f4eeb1 Merge "Settings: change the TTS text to use the current locale" into nyc-dev 
am: b1cdea67a5

* commit 'b1cdea67a5e2dda1ece17df4b98f20e7eeaa8a46':
  Settings: change the TTS text to use the current locale

Change-Id: I3dbff4d2ab2b2cb34ab0adf765a75f0bafd33aa8
 2016-04-21 20:03:15 +00:00
Mihai Nita
093817bd23 Merge "Settings: change the TTS text to use the current locale" into nyc-dev 
am: b1cdea67a5

* commit 'b1cdea67a5e2dda1ece17df4b98f20e7eeaa8a46':
  Settings: change the TTS text to use the current locale

Change-Id: I1f7098ef1541f9ce89b2fdf2e701cd87166ba777
 2016-04-21 20:03:14 +00:00
Mihai Niță
b1cdea67a5 Merge "Settings: change the TTS text to use the current locale" into nyc-dev 2016-04-21 19:55:42 +00:00
Android Build Merger (Role)
80219b3060 Merge "Merge "Fix ApnSettings crash issue." into nyc-dev am: afdcb6a78e am: 33c6972453" into nyc-mr1-dev-plus-aosp 2016-04-21 19:51:51 +00:00
Amit Mahajan
ce19d8d97f Merge "Fix ApnSettings crash issue." into nyc-dev am: afdcb6a78e 
am: 33c6972453

* commit '33c69724536847fbd0272f48e359565a8772a405':
  Fix ApnSettings crash issue.

Change-Id: Ic03b9c03495c5c6999b375c8eb4c485ad9ea2cd5
 2016-04-21 19:51:44 +00:00
Sudheer Shanka
c3eb16ed18 Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO. 
- Also fix an issue where we are showing the app name instead of it's
  installer name.

Bug: 28301883
Change-Id: I392f7d01f5ec4d1ba5b5030e33ebe8260ff5aa31
 2016-04-21 12:51:43 -07:00
Amit Mahajan
db6cedcfe7 Merge "Fix ApnSettings crash issue." into nyc-dev am: afdcb6a78e 
am: c91589bddf

* commit 'c91589bddf7b170cca768584c0b607bf9bd3951d':
  Fix ApnSettings crash issue.

Change-Id: I0f5aee07478f05b2442d1dd8ab8c478a2da17786
 2016-04-21 19:51:42 +00:00
yifan.bai
c91589bddf Merge "Fix ApnSettings crash issue." into nyc-dev 
am: afdcb6a78e

* commit 'afdcb6a78ebc1c5c685e0b24fbf6bb5c23434b95':
  Fix ApnSettings crash issue.

Change-Id: I00942a1d1cc6d1da14cfe31f32fd813796c20fa2
 2016-04-21 19:49:29 +00:00
yifan.bai
33c6972453 Merge "Fix ApnSettings crash issue." into nyc-dev 
am: afdcb6a78e

* commit 'afdcb6a78ebc1c5c685e0b24fbf6bb5c23434b95':
  Fix ApnSettings crash issue.

Change-Id: I01da009772e6689a62fca6686900039ec4201fb5
 2016-04-21 19:49:28 +00:00
Andrew Sapperstein
18b6b04772 Merge "Delete ToastController." 2016-04-21 19:45:53 +00:00
Amit Mahajan
afdcb6a78e Merge "Fix ApnSettings crash issue." into nyc-dev 2016-04-21 19:41:13 +00:00
Robin Lee
99301e06fa resolve merge conflicts of 04c7dc2 to master 
Change-Id: I65d9aa34af7d9138b8b0b5ee76dc0de800d88d26
 2016-04-21 20:39:13 +01:00
yifan.bai
27b908f6d1 Fix ApnSettings crash issue. 
Steps:
1. Add a new APN;
2. Click 'Reset to default';
3. During reset, click the new APN;
4. Crash happened.
Solution:
Disable menu items when reseting default APN.

Bug: 28314239
Change-Id: I8df439d066e58039e9f91a9be642127eb7298159
 2016-04-21 19:23:25 +00:00
Robin Lee
eaad6d7fcc Merge changes Ibac27ee1,I336aeefd into nyc-dev am: e2ae135d3c 
am: 69f12b6e6f

* commit '69f12b6e6f405ea0f8205efe11cddc5bb25c54dc':

Change-Id: Id1f0ba90111b8f233a1444d8b97e1ab7c3f6eb2d
 2016-04-21 19:22:35 +00:00
Robin Lee
04c7dc2424 Merge changes Ibac27ee1,I336aeefd into nyc-dev am: e2ae135d3c 
am: 4a588faeb8

* commit '4a588faeb8597fcfe49e1eac90307fb3fbdab244':
  Be more aggressive caching Vpn preference attrs
  One updateSummary method called by all VPN prefs

Change-Id: I398e1c8ee75c0cec6a569cc469996a5867d8975c
 2016-04-21 19:20:05 +00:00
Robin Lee
4a588faeb8 Merge changes Ibac27ee1,I336aeefd into nyc-dev 
am: e2ae135d3c

* commit 'e2ae135d3c0612081eb6f23e37011e05136a6693':
  Be more aggressive caching Vpn preference attrs
  One updateSummary method called by all VPN prefs

Change-Id: I5d447989c9a149314bf0fcde0e4f1f77b868f40e
 2016-04-21 19:17:51 +00:00
Robin Lee
69f12b6e6f Merge changes Ibac27ee1,I336aeefd into nyc-dev 
am: e2ae135d3c

* commit 'e2ae135d3c0612081eb6f23e37011e05136a6693':
  Be more aggressive caching Vpn preference attrs
  One updateSummary method called by all VPN prefs

Change-Id: I93ffd1d56ca9ff4d8e9c8e16fc897e2368ae1260
 2016-04-21 19:17:50 +00:00
Robin Lee
e2ae135d3c Merge changes Ibac27ee1,I336aeefd into nyc-dev 
* changes:
  Be more aggressive caching Vpn preference attrs
  One updateSummary method called by all VPN prefs
 2016-04-21 19:13:49 +00:00
Fan Zhang
b31f7562ff Merge "Open Help forum in browser when click \'Forum\' button." into nyc-mr1-dev am: dd2797d3ef 
am: ac42fbcfec

* commit 'ac42fbcfec708562060fd9befa729825fe400948':
  Open Help forum in browser when click 'Forum' button.

Change-Id: If2efcafb649f105a0ac9f95e7d466c552f3a5149
 2016-04-21 18:50:34 +00:00
Fan Zhang
ac42fbcfec Merge "Open Help forum in browser when click \'Forum\' button." into nyc-mr1-dev 
am: dd2797d3ef

* commit 'dd2797d3eff2ab2bb0b42efba4319c6a1249a4c4':
  Open Help forum in browser when click 'Forum' button.

Change-Id: I287fe83878876329eb95a2384c5e47b3f55635bc
 2016-04-21 18:48:16 +00:00
Jason Monk
9ae9194d28 Merge "Fix summary loader lifecycle" into nyc-dev am: 1624f69ac9 am: 2548717d8b 
am: c50b9ea495

* commit 'c50b9ea495c855a8ad0af07b3aa04884af4318d5':

Change-Id: I07fef89391a49f7b2e9362667e6208036e15fdc1
 2016-04-21 18:34:48 +00:00
Jason Monk
fa812a5e48 Merge "Fix summary loader lifecycle" into nyc-dev am: 1624f69ac9 am: 2424d1dc04 
am: f1a78a1264

* commit 'f1a78a1264c4cc908f79a2259f57848147d512a5':
  Fix summary loader lifecycle

Change-Id: Iec4a09103f6b07f38c8082ae1dee362dd3c4c9e1
 2016-04-21 18:34:46 +00:00
Jason Monk
c50b9ea495 Merge "Fix summary loader lifecycle" into nyc-dev am: 1624f69ac9 
am: 2548717d8b

* commit '2548717d8b7610081950a83d497c0236dcf2f0c8':

Change-Id: I5156a325c12f514bc680e56158d1f12402fa4fd0
 2016-04-21 18:32:53 +00:00
Jason Monk
f1a78a1264 Merge "Fix summary loader lifecycle" into nyc-dev am: 1624f69ac9 
am: 2424d1dc04

* commit '2424d1dc043ce0f7113bd789f2701beb8484c9b5':
  Fix summary loader lifecycle

Change-Id: Idb8e0530c02389ca097131ed95467042ebe0135c
 2016-04-21 18:30:40 +00:00
Fan Zhang
dd2797d3ef Merge "Open Help forum in browser when click 'Forum' button." into nyc-mr1-dev 2016-04-21 18:28:46 +00:00
Jason Monk
2548717d8b Merge "Fix summary loader lifecycle" into nyc-dev 
am: 1624f69ac9

* commit '1624f69ac92d1358a2401125033be5c83025a140':
  Fix summary loader lifecycle

Change-Id: Icb1deb9de59dbb7cc3cf6cea80fb8e11445c20a3
 2016-04-21 18:28:21 +00:00
Jason Monk
2424d1dc04 Merge "Fix summary loader lifecycle" into nyc-dev 
am: 1624f69ac9

* commit '1624f69ac92d1358a2401125033be5c83025a140':
  Fix summary loader lifecycle

Change-Id: Ib6e0e9de81d9b57e180825b8992ef08327fec9b1
 2016-04-21 18:28:19 +00:00
Jason Monk
1624f69ac9 Merge "Fix summary loader lifecycle" into nyc-dev 2016-04-21 18:20:08 +00:00
Jason Monk
0842797a25 Fix summary loader lifecycle 
Previous CL accidentally cleared the listening bit too early making
it never actually tell the SummaryProviders to stop listening.

Change-Id: I6af1acc861f6987b33641c40637354c75cf4d708
Fixes: 28306872
 2016-04-21 14:15:13 -04:00
Daniel Nishi
839b4ce52b Merge "Add a deletion helper view for clearing space." into nyc-mr1-dev am: 179103258e 
am: 7000aa91b0

* commit '7000aa91b05a65527c95b1e54cdc1665b8d66c3f':
  Add a deletion helper view for clearing space.

Change-Id: I89b59d3955526ecd40dba8464802088bd1daab3f
 2016-04-21 17:29:53 +00:00
Daniel Nishi
7000aa91b0 Merge "Add a deletion helper view for clearing space." into nyc-mr1-dev 
am: 179103258e

* commit '179103258e4e664fbdd76b8440aff3edae86b093':
  Add a deletion helper view for clearing space.

Change-Id: If02b00b3e35e717508ae69894a36ac71a1c3c30f
 2016-04-21 17:27:16 +00:00
Yohei Yukawa
313673b5b3 Merge "Support IMEs that have no subtype in PhysicalKeyboardFragment." into nyc-dev am: b156761ae8 am: 8535b31025 
am: 35c344afd9

* commit '35c344afd9850f557e644d8ee6a772234e64ad86':

Change-Id: I7a3ad0f615ea770011e25230e7977cc0a5e54870
 2016-04-21 17:24:37 +00:00
Yohei Yukawa
3d60b539d3 Merge "Support IMEs that have no subtype in PhysicalKeyboardFragment." into nyc-dev am: b156761ae8 am: c61d822f6e 
am: 06c7b26951

* commit '06c7b269517da6ad85d77d3ecfbb62260f06aa0e':
  Support IMEs that have no subtype in PhysicalKeyboardFragment.

Change-Id: I236ece93cfc6a88fb6e7e79a3ea4e2896b82a724
 2016-04-21 17:24:35 +00:00