drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
213,094 Commits 1 Branch 0 Tags
Commit Graph

18692 Commits

Author SHA1 Message Date
Jeff Sharkey
f2a3c341ab Merge "Allow customisation of advanced settings in DocumentsUI" 
am: f1b325c1ec

* commit 'f1b325c1ec41c09f6efeb3d7709e7e7af93eacb8':
  Allow customisation of advanced settings in DocumentsUI
 2015-12-03 23:11:51 +00:00
Jeff Sharkey
f1b325c1ec Merge "Allow customisation of advanced settings in DocumentsUI" 2015-12-03 23:04:29 +00:00
Edward Savage-Jones
827dec0e48 Allow customisation of advanced settings in DocumentsUI 
Enables the customisation of the default value of the DocumentsUI
'advanced' setting using overlays.

Change-Id: I240cbb845d15ab2ea6ae7a79a17b4f51905fdb9c
 2015-12-03 23:02:47 +00:00
Chris Tate
b5a38f6da5 Merge "Don\'t back up / restore EAP network definitions" 
am: 14a0981fde

* commit '14a0981fdef45967b19c3db4fb2f298c8b5a1f7c':
  Don't back up / restore EAP network definitions
 2015-11-20 18:05:04 +00:00
Christopher Tate
9bc2f472e9 Don't back up / restore EAP network definitions 
Bug 25725016

Change-Id: Idfef9dd53f2403bbe4c950493a0ab8fa66a3b7d4
 2015-11-18 13:42:04 -08:00
Svetoslav Ganov
5522efb130 Merge "Avoid NPE in printspooler when changing language" 
am: 8d8515e708

* commit '8d8515e708f0cebf69587750bbb3abcb315cc61e':
  Avoid NPE in printspooler when changing language
 2015-11-10 01:03:05 +00:00
Baligh Uddin
69cc50f1e8 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:49:59 +00:00
Baligh Uddin
97bf3b5922 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:49:31 +00:00
Baligh Uddin
5495ee8a9b Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:49:27 +00:00
Baligh Uddin
57b7fa49ac Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:49:23 +00:00
Baligh Uddin
6be193d87e Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:49:19 +00:00
Baligh Uddin
8019f49d08 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:49:17 +00:00
Baligh Uddin
37a728001d Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:40:41 +00:00
Baligh Uddin
ed472fba42 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:40:25 +00:00
Baligh Uddin
e1348a7fa9 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:40:15 +00:00
Baligh Uddin
2523c61fb7 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:40:04 +00:00
Baligh Uddin
c138df954f Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:39:16 +00:00
Baligh Uddin
aa4dbe2d84 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:39:12 +00:00
Baligh Uddin
70df552ac2 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:32:07 +00:00
Masaaki Iwaguchi
86d13f3daf Avoid NPE in printspooler when changing language 
PrintActivity is recreated when the language setting is changed.
As a result of the recreation mCurrentPrinter is null, which causes
a NullPointerException when onActivityResult() is called.

The issue is solved with a simple null check.

Change-Id: Ic58f0ca01577d2ec02d494739f3bc2f06240dd44
 2015-11-05 17:39:21 +00:00
Baligh Uddin
c94647cfb3 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I20cf8ac4a5039ead0a65bd2e38ded78542a7a3e8
 2015-11-04 15:59:57 -08:00
Baligh Uddin
599c81d0ea Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I924e59eeff537a0f66ae7ac7ace1dacd1f89f35e
 2015-11-04 15:57:40 -08:00
Baligh Uddin
f231f4fccb Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I200b933f68468a0e919d917ac93b33e4526bc1d0
 2015-11-04 15:48:25 -08:00
Baligh Uddin
40fa6b1e91 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I44df802e45a340d7ef7f094c6c06001d350bb0c5
 2015-11-04 15:46:28 -08:00
Baligh Uddin
c1a6632df5 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I17d9389bfd2a83e57d20cb5de3e227cc34e09cbe
 2015-11-04 15:44:21 -08:00
Baligh Uddin
a1d63092b7 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I55bd76c512148127b06a36950cf66da55c9295dc
 2015-11-04 15:39:05 -08:00
Baligh Uddin
e22fb216ee Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I76a9ab65d1fe10e2915e5cd794a5cbce1697a933
 2015-11-04 15:36:55 -08:00
Baligh Uddin
a1065cf5d9 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I924dde8b982ce94128882b484e9c3e9dc5c49013
 2015-11-04 15:34:55 -08:00
Baligh Uddin
8ff8892c12 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I76cc8d18dd82f9af09310685a88843eeb71a991c
 2015-11-04 15:32:37 -08:00
Baligh Uddin
7ca7920f8d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: Iec5d9e5b20c530e3056e2410af42fd8af8c16788
 2015-11-04 15:30:29 -08:00
Baligh Uddin
87428865b2 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I790f09439e904a82ed90ec07f6bbdab1e8ef42d8
 2015-11-04 15:28:25 -08:00
Baligh Uddin
5bc5bb57f3 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I87a141d9b4b2ac688432d52e1bbe15626b1f301b
 2015-11-04 15:26:15 -08:00
Baligh Uddin
185269d3e9 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I3ae0e8f44a5933c708d072f2053dbde77795e411
 2015-11-04 11:56:04 -08:00
Baligh Uddin
3a68edba5c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I46efa0b9d7293d80c68cb6a1e21dfaa509c6d7d2
 2015-11-04 11:51:55 -08:00
Julia Reynolds
537af1070b Merge "SystemUI: Reload the EndNowButton label" am: 40b52bbe48 
am: c7839bde7c

* commit 'c7839bde7cd8ed21326208b17030c87e8bf206c9':
  SystemUI: Reload the EndNowButton label
 2015-10-26 15:15:24 +00:00
Julia Reynolds
c7839bde7c Merge "SystemUI: Reload the EndNowButton label" 
am: 40b52bbe48

* commit '40b52bbe480436fbdc3bfb8a1a70c6144e71ff8f':
  SystemUI: Reload the EndNowButton label
 2015-10-26 15:05:34 +00:00
Johan Redestig
f2d824fd56 SystemUI: Reload the EndNowButton label 
Reload the EndNowButton label when configuration
changes.

Change-Id: I042d31f0bb011996aa8219c3c412e7b71987244c
 2015-10-26 15:51:23 +01:00
Kenny Root
6938fbf3a5 Merge "Add Workman keyboard layout" am: 9a65c36022 
am: b0cc47efe5

* commit 'b0cc47efe5d7c200fe7d527c8c17d0854dfe3d35':
  Add Workman keyboard layout
 2015-10-23 23:49:39 +00:00
Kenny Root
b0cc47efe5 Merge "Add Workman keyboard layout" 
am: 9a65c36022

* commit '9a65c36022482d7fd4217e537fa434cc79b69f39':
  Add Workman keyboard layout
 2015-10-23 23:39:24 +00:00
Kenny Root
9a65c36022 Merge "Add Workman keyboard layout" 2015-10-23 23:32:01 +00:00
Dmitry Torokhov
3eba93f21c SystemUI: fix automatic pairing of BT keyboards am: 79f00cf06f am: d3eee7c410 
am: 5c6a3872cb

* commit '5c6a3872cb0df50e9a8d2aaa0b8f84e78cd4433f':
  SystemUI: fix automatic pairing of BT keyboards
 2015-10-22 18:24:35 +00:00
Dmitry Torokhov
5c6a3872cb SystemUI: fix automatic pairing of BT keyboards am: 79f00cf06f 
am: d3eee7c410

* commit 'd3eee7c410dbc6f8eb5133a347fb0a0ce7221893':
  SystemUI: fix automatic pairing of BT keyboards
 2015-10-22 18:18:46 +00:00
Dmitry Torokhov
d3eee7c410 SystemUI: fix automatic pairing of BT keyboards 
am: 79f00cf06f

* commit '79f00cf06f5e70047d73b48d20910b967353b075':
  SystemUI: fix automatic pairing of BT keyboards
 2015-10-22 18:13:36 +00:00
Dmitry Torokhov
79f00cf06f SystemUI: fix automatic pairing of BT keyboards 
After reset (docking) Pixel C Keyboard that was previously paired with
a device goes into so-called non-discoverable mode, where it will
establish connection only with device that it has connected before. When
scanning for available devices we need to wait till the keyboard starts
advertising itself as discoverable, and only then try to pair.

Also, let's flush the device cache when we attach the base to make sure
the device that we seen before and cached again in the right state after
reset.

Bug: 24915541
Change-Id: I136c1c4235080a25529b4b1c2b1da9bc18508811
 2015-10-22 10:19:32 -07:00
Daniel Sandler
f5450e1b33 Merge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev am: cb10c09f0a am: b4aa8b0c5b 
am: f7284546d9

* commit 'f7284546d930583d1f7d6ca50d80bd74be3eeae4':
  Delay hiding the cast icon for 3 seconds.
 2015-10-21 23:30:29 +00:00
Daniel Sandler
f7284546d9 Merge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev am: cb10c09f0a 
am: b4aa8b0c5b

* commit 'b4aa8b0c5b65d301611ca4c0492b2a9ed67a5a1a':
  Delay hiding the cast icon for 3 seconds.
 2015-10-21 23:24:36 +00:00
Daniel Sandler
b4aa8b0c5b Merge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev 
am: cb10c09f0a

* commit 'cb10c09f0a6c0750d79bf4f681a623fa35f4cef7':
  Delay hiding the cast icon for 3 seconds.
 2015-10-21 23:18:54 +00:00
Daniel Sandler
cb10c09f0a Merge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev 2015-10-21 23:14:50 +00:00
Dan Sandler
8fd25bf771 Delay hiding the cast icon for 3 seconds. 
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.

Bug: 19121797
Change-Id: I52b69b2029439d42163ead5dc8748889b4f61934
 2015-10-21 15:42:48 -07:00
Selim Cinek
49ebad9e66 Merge "Changing the ordering for heads up notifications" into mnc-dr-dev am: 688e046bad am: f9c4f745e6 
am: ae070b96ac

* commit 'ae070b96acc23e1e6c4ca979d72c39e0d91e583a':
  Changing the ordering for heads up notifications
 2015-10-21 20:59:42 +00:00