188509 Commits

Author SHA1 Message Date
John Reck
f7a61483bc Merge "A bunch more cleanups" 2015-04-15 14:48:19 +00:00
Geoff Mendal
50d9509c34 am 360d0f61: (-s ours) Import translations. DO NOT MERGE
* commit '360d0f615eebe5aba0fa574acf81459cca8dd1f0':
  Import translations. DO NOT MERGE
2015-04-15 14:38:54 +00:00
Geoff Mendal
360d0f615e Import translations. DO NOT MERGE
Change-Id: Ic858a50c432b07464acba53ea9775aab3e98c633
Auto-generated-cl: translation import
2015-04-15 07:28:29 -07:00
Geoff Mendal
acb221fd04 Merge "Import translations. DO NOT MERGE" 2015-04-15 14:24:58 +00:00
Geoff Mendal
d6f5926fd9 Import translations. DO NOT MERGE
Change-Id: I8808553e1586e7c996c60ee9903fbd47293f52a1
Auto-generated-cl: translation import
2015-04-15 07:24:02 -07:00
Geoff Mendal
7526611f51 Merge "Import translations. DO NOT MERGE" 2015-04-15 13:00:52 +00:00
Geoff Mendal
366c18b74d Import translations. DO NOT MERGE
Change-Id: I44ddb37b2a54af8c7b9861f362a5a2af2ded02e7
Auto-generated-cl: translation import
2015-04-15 05:54:00 -07:00
Wale Ogunwale
cc3c34c967 Merge "Added watchdog monitor for Binder threads availability." 2015-04-15 12:35:34 +00:00
Geoff Mendal
017ed840fa Merge "Import translations. DO NOT MERGE" 2015-04-15 12:33:59 +00:00
Geoff Mendal
abe227efc0 Import translations. DO NOT MERGE
Change-Id: Ia143e1bd7c7cee3497b8ea298dc8286147da8bbd
Auto-generated-cl: translation import
2015-04-15 05:33:25 -07:00
Geoff Mendal
b47a7fe7c6 Import translations. DO NOT MERGE
Change-Id: Ia8ffbde888155d62a59ca824069187db7b9895b8
Auto-generated-cl: translation import
2015-04-15 05:16:32 -07:00
Lorenzo Colitti
e9a88a3844 Merge changes from topic 'no_internet'
* changes:
  Add a noInternetAccessExpected boolean to WifiConfiguration.
  Prompt if a network without an Internet connection is selected
  Give SystemUI the OVERRIDE_WIFI_CONFIG permission.
  Add an UNKNOWN_UID constant to WifiConfiguration.
2015-04-15 11:48:22 +00:00
Michael Wright
fdddb4eb69 Merge "Mark AVRCP devices as internal." 2015-04-15 11:38:58 +00:00
Michael Wright
40832ac395 am 6fb80b70: am 99e23088: am 150e0e87: Merge "fix return value scale of notifyANR()"
* commit '6fb80b704e7808e4e7cd15f6ccade1e4b6406b56':
  fix return value scale of notifyANR()
2015-04-15 11:32:31 +00:00
Michael Wright
6fb80b704e am 99e23088: am 150e0e87: Merge "fix return value scale of notifyANR()"
* commit '99e23088843eddede29d0fc5ca30a83f147f31b0':
  fix return value scale of notifyANR()
2015-04-15 11:21:06 +00:00
Michael Wright
99e2308884 am 150e0e87: Merge "fix return value scale of notifyANR()"
* commit '150e0e87e1faa01f927cfe8c7110ef843612a1df':
  fix return value scale of notifyANR()
2015-04-15 11:10:58 +00:00
Michael Wright
150e0e87e1 Merge "fix return value scale of notifyANR()" 2015-04-15 10:53:21 +00:00
Martijn Coenen
741e89121b am 1f440cb0: am 895f3c27: am 6a47a861: Merge "Add getPrefixAids()."
* commit '1f440cb0b8d2c84fd1bb2e06fcc94d86717f648a':
  Add getPrefixAids().
2015-04-15 10:07:44 +00:00
Martijn Coenen
1f440cb0b8 am 895f3c27: am 6a47a861: Merge "Add getPrefixAids()."
* commit '895f3c27269d14ec53ff3ae8526342f9b57a10e1':
  Add getPrefixAids().
2015-04-15 09:51:52 +00:00
Martijn Coenen
895f3c2726 am 6a47a861: Merge "Add getPrefixAids()."
* commit '6a47a86112e271d200f77d5ec66f5f50979135ca':
  Add getPrefixAids().
2015-04-15 09:37:56 +00:00
Benjamin Franz
b4e2188321 Merge "Fix a SecurityException in setKeyguardEnabledState" 2015-04-15 08:29:15 +00:00
Martijn Coenen
6a47a86112 Merge "Add getPrefixAids()." 2015-04-15 08:00:13 +00:00
Martijn Coenen
ed3a29ea08 Add getPrefixAids().
Bug: 19144664
Change-Id: Ia49550102ccf1d40cd3f2bf7e5bd64d444a2e8a3
2015-04-15 09:48:57 +02:00
Chris Banes
5c1405e10c Merge "Unhide PopupWindow window layout type calls" 2015-04-15 07:05:51 +00:00
Erik Kline
8b66974758 Merge "multinetwork API: native implementation" 2015-04-15 06:50:25 +00:00
Erik Kline
25f3b7bb2d multinetwork API: native implementation
Bug: 19537384
Change-Id: I04f4a7de2b1e583989b67a853df6ab50289c2185
2015-04-15 15:32:08 +09:00
Jae Seo
b744e47959 Merge "TIF: Add pixel aspect ratio to TvTrackInfo" 2015-04-15 05:51:18 +00:00
Daichi Hirono
52743f3b17 Merge "DocumentsUI: Use system cancel string resources." 2015-04-15 05:44:15 +00:00
Daichi Hirono
e4db58edd4 DocumentsUI: Use system cancel string resources.
BUG=None

Change-Id: I989e28ad4729176d66b1b333f242470129d139fa
2015-04-15 14:33:52 +09:00
Jim Miller
485a3cb2bc Merge "Several fixes to Fingerprint code after large merge - route fingerprint enrollment auth token - replace "processed" event with "authenticated" - fix type-o in strings.xml" 2015-04-15 05:25:24 +00:00
Jeff Sharkey
9f09b2d93f Merge "Persist nickname and flags for volumes." 2015-04-15 05:03:08 +00:00
Daichi Hirono
1a2fdb496e DocumentsUI: Move intent related constants to BaseActivity.DocumentsIntent.
BUG=None
Change-Id: I81d367d5f8d727a5fa76bc22b2fe871ae441dbcf
2015-04-15 13:43:28 +09:00
Jeff Sharkey
d95d3bfb2b Persist nickname and flags for volumes.
StorageManager now offers to persist a nickname and user flags for
active volumes.  This metadata is kept around and spliced into
any future VolumeInfo when the same UUID is present.  Current user
flags indicate "initialized" and "snoozed" states to control how
notifications are shown.

Notify listeners when metadata changes, and kick public notification
after a volume is initialized.  Make unique PendingIntents when
multiple volumes are active.

Beginnings of plumbing to ask for missing volumes.

Offer explicit accessors for VolumeInfo and DiskInfo to give better
path to documentation and deprecation.

Bug: 19993667
Change-Id: I3d8b68be83f43ba992d21d51cad5b775776d681c
2015-04-14 21:39:47 -07:00
Lorenzo Colitti
1248dd3c29 Add a noInternetAccessExpected boolean to WifiConfiguration.
This will be set if the user explicitly confirms a connection to
a Wi-Fi network without Internet access and checks the "don't ask
again" box.

Bug: 20081183
Change-Id: I75223ae41dbf0d3a827527a0a131855d8eb4c515
2015-04-15 13:38:22 +09:00
Lorenzo Colitti
e03c3c7edf Prompt if a network without an Internet connection is selected
When a network is explicitlySelected, keep it connected but do
not automatically switch to it. Instead, attempt to validate it,
and if 8 seconds have passed and the network is not yet
validated, prompt the user asking whether to switch to it anyway.

Bug: 20081183
Change-Id: I03a8459eb39979e3dc8e94662b85a44605dd7e69
2015-04-15 13:38:22 +09:00
Daichi Hirono
c96e494ac7 Merge "DocumentsUI: Filter out downloads root if the source documents include directory." 2015-04-15 04:30:10 +00:00
Wale Ogunwale
d7fdd0228e Added watchdog monitor for Binder threads availability.
The watchdog will trigger if all binder threads in the system_server
are stuck for a long time (1min) preventing the process from
handling additional IPC requests.

Bug: 19297165
Change-Id: I5909a9c230bf23917feaed53f2b54bd50425bf3c
2015-04-14 21:28:34 -07:00
Daichi Hirono
9be34298be DocumentsUI: Filter out downloads root if the source documents include directory.
This is the short term solution for the downloads root, which does not support
directory creation. For the long term solution, we need to add a flag to Root
model to check if the root support directory creation or not.

BUG=20186663

Change-Id: I15c4795892f38e3f968776f732a6f2160ae775fc
2015-04-15 13:27:55 +09:00
Keisuke Kuroyanagi
e26bd2c361 Merge "Fix crash when ellipsize="start" is applied to short line." 2015-04-15 04:04:46 +00:00
Tomasz Mikolajewski
3b5adaaca1 Merge "Add an initial version of the copy failure dialog to DocumentsUI." 2015-04-15 04:02:14 +00:00
Daichi Hirono
738ed14290 Merge "DocumentsUI: Polish buttons of copy destination dialog." 2015-04-15 04:00:02 +00:00
Daichi Hirono
de021abe40 DocumentsUI: Polish buttons of copy destination dialog.
* Add cancel button to directory picker dialog.
* Turns "select" label to "copy to" label for copy destination picker.

BUG=20170953

Change-Id: I66214804aed75a6fccc716d1a01163c634e73d7f
2015-04-15 12:57:53 +09:00
Jim Miller
fe6439f02d Several fixes to Fingerprint code after large merge
- route fingerprint enrollment auth token
- replace "processed" event with "authenticated"
- fix type-o in strings.xml

Change-Id: If06b4438c94fd7fca07a8b7b1b5fa16dd94b3831
2015-04-14 20:47:55 -07:00
Tomasz Mikolajewski
61686593fd Add an initial version of the copy failure dialog to DocumentsUI.
Change-Id: Ibdfde661aa5b636570c017d3d00565c193d595a3
2015-04-15 12:39:27 +09:00
Lorenzo Colitti
e14627e4f3 Give SystemUI the OVERRIDE_WIFI_CONFIG permission.
Settings already has this permission, and SystemUI needs it as
well so that the changes made by Wi-Fi Quick Settings are
recognized to be made by the system and not just by any app.

Bug: 20081183
Change-Id: Ie1760fc24f5f74839718fff9763f38c80cdda3ff
2015-04-15 12:33:13 +09:00
Lorenzo Colitti
1ac50cb32c Add an UNKNOWN_UID constant to WifiConfiguration.
This value will be used to indicate that one of the various UIDs
tracked stored in the WifiConfiguration is unknown. Currently the
code just uses "-1" everywhere for this purpose; a constant is
clearer.

Bug: 20081183
Change-Id: Id865da9284f642587eed11f67685e5b12ce772c2
2015-04-15 12:33:13 +09:00
Joe Fernandez
3abfa03e37 am 808042e6: am e635f9b5: am 726466c2: am 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs
* commit '808042e6c2244b24acb30c0f33439c730fa0acd7':
  docs: Add Cross-References to Material Design Spec
2015-04-15 02:16:55 +00:00
Jean-Michel Trivi
f14c535041 Merge "Define AudioMix state constants" 2015-04-15 02:05:44 +00:00
Andy Hung
8f08d04b4e Merge "Default to minimum buffer size for AudioRecord.Builder" 2015-04-15 01:54:20 +00:00
Ronghua Wu
0e08a225da Merge "media: Add reason to CodecException." 2015-04-15 01:40:52 +00:00