Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
246,497 Commits 3 Branches 0 Tags
ffe7746437e8f06cc7dd2571c3354973791c8a8a
Commit Graph

246497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phil Weaver
d56cd1fcab Merge "Fix a race in settings update." into nyc-dev 
am: df15e03ed0

* commit 'df15e03ed062493b506f7599ff1e6aff26828485':
  Fix a race in settings update.

Change-Id: I970606b21b1a5cd2d19e0f21077636e68f107c6b
 2016-05-12 16:53:49 +00:00
Julia Reynolds
94ad652c7a resolve merge conflicts of 407c434 to nyc-mr1-dev 
Change-Id: I7d4590dc22902dade7a8f81bb1a8321b526a4925
 2016-05-12 12:45:29 -04:00
smain@google.com
8a68194477 replace tools videos with latest reto studio videos. am: b69830f76c am: 685953ae53 
am: 55272f0f5e

* commit '55272f0f5e695c4936af368d2774a3f78108ff56':
  replace tools videos with latest reto studio videos.

Change-Id: I76751d738039f95559393471a33f17a45772749a
 2016-05-12 16:36:13 +00:00
smain@google.com
55272f0f5e replace tools videos with latest reto studio videos. am: b69830f76c 
am: 685953ae53

* commit '685953ae53b74007ec2049e0b01a9ad5bb3e9d1b':
  replace tools videos with latest reto studio videos.

Change-Id: Ib2532713d29fe7e35765fb7d70fd4521caf3f6c6
 2016-05-12 16:33:32 +00:00
Makoto Onuki
26edcba2c9 Merge "Remove ShortcutManager" into nyc-dev 2016-05-12 16:32:56 +00:00
smain@google.com
685953ae53 replace tools videos with latest reto studio videos. 
am: b69830f76c

* commit 'b69830f76ce3cc4660b6547e3bdeda3ba508d727':
  replace tools videos with latest reto studio videos.

Change-Id: I697251519e2afebbb240e81782f325d801c3f428
 2016-05-12 16:30:58 +00:00
smain@google.com
b69830f76c replace tools videos with latest reto studio videos. 
Change-Id: I7953a6834969251533b38f0a8dd67e0d91fede7e
 2016-05-12 09:23:31 -07:00
Philip P. Moltmann
808f2c361a Merge "Handle failure to create file." into nyc-dev 2016-05-12 16:16:40 +00:00
Phil Weaver
df15e03ed0 Merge "Fix a race in settings update." into nyc-dev 2016-05-12 15:43:08 +00:00
Julia Reynolds
407c4343b2 Merge "Logging for QS settings launch." into nyc-dev 2016-05-12 15:32:38 +00:00
Richard Uhler
a68dc2ed55 Merge "Fix --reset argument to \'cmd package compile\'." into nyc-dev 
am: e4a3e5e8f1

* commit 'e4a3e5e8f13c4290e3e4c5667bedcd66ce699e63':
  Fix --reset argument to 'cmd package compile'.

Change-Id: I26533be1c9c2dac22b8ff4a5882abc8ded832255
 2016-05-12 15:17:37 +00:00
Richard Uhler
e4a3e5e8f1 Merge "Fix --reset argument to 'cmd package compile'." into nyc-dev 2016-05-12 15:13:04 +00:00
Alan Viverette
941bbd4eb7 Merge "Remove extra logging in DatePicker" into nyc-dev 
am: c952b035b2

* commit 'c952b035b27c858a8d0c794282146f5dd31020e9':
  Remove extra logging in DatePicker

Change-Id: I69aa4f977bc8f3d31872f69f735d96188830043e
 2016-05-12 15:02:36 +00:00
Alan Viverette
c952b035b2 Merge "Remove extra logging in DatePicker" into nyc-dev 2016-05-12 14:57:58 +00:00
Julia Reynolds
8f3e66f2fe Logging for QS settings launch. 
Change-Id: Iff8bbb448454c8a82196d292a285827846b28357
Fixes: 28678032
 2016-05-12 10:33:47 -04:00
Chris Wren
d328afff96 Merge "document the return type of getImportance" into nyc-dev 
am: 3041d49d88

* commit '3041d49d888cf0732c8aafb88d1d931b696b1d41':
  document the return type of getImportance

Change-Id: I3cf45be03a8e62ca48d25d26b9b234bb9f800146
 2016-05-12 13:00:45 +00:00
Chris Wren
3041d49d88 Merge "document the return type of getImportance" into nyc-dev 2016-05-12 12:53:51 +00:00
Jaewan Kim
1f7f01ec77 Merge "Fix continous crash in WindowManager in boot" into nyc-dev 
am: 927b6be3d9

* commit '927b6be3d960a42bbc75aacc8dcde792a1d564b4':
  Fix continous crash in WindowManager in boot

Change-Id: I6207c320404ff1f0fed5284afe550a9163ea78a7
 2016-05-12 12:35:42 +00:00
Jaewan Kim
927b6be3d9 Merge "Fix continous crash in WindowManager in boot" into nyc-dev 2016-05-12 12:32:01 +00:00
Jaewan Kim
3328433f13 Fix continous crash in WindowManager in boot 
Bug: 28728894
Change-Id: I660e2709a674eb4089dbb38173375491a87828db
 2016-05-12 21:29:26 +09:00
Calin Juravle
9f706d50bc Merge "Do not clear profiles after OTAs" into nyc-dev 
am: 4ee1c943ab

* commit '4ee1c943ab5f7f69355d1413bca981812a804a67':
  Do not clear profiles after OTAs

Change-Id: Icf79d5c8eef4006fba3a5eb118d9882b02b36fb7
 2016-05-12 10:00:36 +00:00
TreeHugger Robot
4ee1c943ab Merge "Do not clear profiles after OTAs" into nyc-dev 2016-05-12 09:52:56 +00:00
Seigo Nonaka
1265d972f9 Fix incorrect inheritance from TextAppearance to Widget. 
Bug: 28713199
Change-Id: I5e7e064670d7947c64397b99a88d5898a4696d5a
 2016-05-12 18:17:45 +09:00
Joe Fernandez
9c9c4654ca docs: Wear Preview landing page updates am: 92abdc08bf am: ca5b9d3224 
am: 6c08da22c7

* commit '6c08da22c706d49d6000b9c884d75c962716dae0':
  docs: Wear Preview landing page updates

Change-Id: Ifca7d1cc2eb5bebc8bb7dc0d0d8ce521feaed74f
 2016-05-12 08:20:11 +00:00
Joe Fernandez
6c08da22c7 docs: Wear Preview landing page updates am: 92abdc08bf 
am: ca5b9d3224

* commit 'ca5b9d3224d4ea72bff42f0ebcb07e5b4628d9f2':
  docs: Wear Preview landing page updates

Change-Id: Ied89e43ca7cbab27bfd9e5fd281766897a697b17
 2016-05-12 08:17:56 +00:00
Joe Fernandez
ca5b9d3224 docs: Wear Preview landing page updates 
am: 92abdc08bf

* commit '92abdc08bf0283cd88ddc63447439cd94030f24a':
  docs: Wear Preview landing page updates

Change-Id: I36335936e136ef9e0e53c15160420e15b67018b2
 2016-05-12 08:15:27 +00:00
Joe Fernandez
92abdc08bf docs: Wear Preview landing page updates 
Change-Id: I9fddcf75f9aba7688a5ae90f127d873eadd17892
 2016-05-12 01:08:41 -07:00
Joe Fernandez
a853370504 Merge "docs: Wear Preview fixing infrastructure for DoDS publishing" into mnc-io-docs am: d3781065ac am: fc468b1556 
am: 8be3fce76c

* commit '8be3fce76c17c91fddb0036050d117e4a606c96c':
  docs: Wear Preview fixing infrastructure for DoDS publishing

Change-Id: I77b1f1bc9c98510e7d9f0bbc240beb046fa411bb
 2016-05-12 06:40:21 +00:00
Joe Fernandez
8be3fce76c Merge "docs: Wear Preview fixing infrastructure for DoDS publishing" into mnc-io-docs am: d3781065ac 
am: fc468b1556

* commit 'fc468b1556a0e41e15c525defd8621d8bc3abdbd':
  docs: Wear Preview fixing infrastructure for DoDS publishing

Change-Id: I1b6ec6c17f705f1833336840e38e146a08f2cfd4
 2016-05-12 06:37:53 +00:00
Joe Fernandez
fc468b1556 Merge "docs: Wear Preview fixing infrastructure for DoDS publishing" into mnc-io-docs 
am: d3781065ac

* commit 'd3781065acf40e59c6f4903b4c5362ac0eac2a3e':
  docs: Wear Preview fixing infrastructure for DoDS publishing

Change-Id: Icea0dec4066359fa1e568e0b241525613a615cb8
 2016-05-12 06:35:00 +00:00
Joe Fernandez
d3781065ac Merge "docs: Wear Preview fixing infrastructure for DoDS publishing" into mnc-io-docs 2016-05-12 06:26:53 +00:00
Joe Fernandez
74c05bbf91 docs: Wear Preview fixing infrastructure for DoDS publishing 
b/28004352

Change-Id: I4db8f6f21581cf57b8469cee34d62954eb62b998
 2016-05-11 23:23:43 -07:00
Dimitry Ivanov
0997908c95 Move Vulkan layer path setup to ApplicationLoaders 
ThreadedRenderer was never the right place for this anyway, and
ApplicationLoaders can provide both the full library search path (not
just the extracted native library dir) as well as the application loader
namespace.

Bug: 28213888
Change-Id: Ibcc0a9178da4dba6f3f3105932fdac1a1d0261af
 2016-05-11 22:59:10 -07:00
Dirk Dougherty
2c32dd72ff Merge "Remove broken video embed." into mnc-mr-docs am: 80a3c76891 am: 1d5d20fba9 am: 0519569eaa 
am: 01a89bebeb

* commit '01a89bebeb6a1c0c8115ebb09fabd14285143dab':
  Remove broken video embed.

Change-Id: Ie75aaa180207f4ff1d0d36422cf4c3d2aea842e1
 2016-05-12 02:45:31 +00:00
Kevin Hufnagle
4f1b24b35a docs: Created content describing high-performance audio. am: 44aff87b6d am: 52648a7913 am: 7ac4b0bf54 am: 2359b62819 
am: 18267e9b33

* commit '18267e9b338be6c2989ba1bd1529c51e619b9962':
  docs: Created content describing high-performance audio.

Change-Id: I4bf805d7058b43c334b8c79079c00fc2f65dc5e9
 2016-05-12 02:45:27 +00:00
David Friedman
055d0dcf90 Merge "Docs: Removes "Guidelines for Education" card from "Essentials". am: 186284a6a6 am: 2e23d6eb96" into mnc-ub-dev am: 23e4fb8137 
am: 0c01d17117

* commit '0c01d17117f0299727b384ceef931fe1507e901f':

Change-Id: I7c60afa76e5ff4ad545cc4966e38a53c0d9bc553
 2016-05-12 02:42:22 +00:00
David Friedman
889e0b7881 Docs: Removes "Guidelines for Education" card from "Essentials". am: 186284a6a6 am: 2e23d6eb96 am: 3f6af30cae 
am: c58d6fa488

* commit 'c58d6fa48899cf97b1129fc741870a73610f20bd':
  Docs: Removes "Guidelines for Education" card from "Essentials".

Change-Id: I9d90c478cc29c163388826d062519979ce875e97
 2016-05-12 02:42:19 +00:00
Dirk Dougherty
01a89bebeb Merge "Remove broken video embed." into mnc-mr-docs am: 80a3c76891 am: 1d5d20fba9 
am: 0519569eaa

* commit '0519569eaaeb5dd3dd3edaeb572346a871c9aa3f':
  Remove broken video embed.

Change-Id: Ia29d6f0b0eb45161e7089ca6d888c975692cd7de
 2016-05-12 02:42:09 +00:00
Kevin Hufnagle
18267e9b33 docs: Created content describing high-performance audio. am: 44aff87b6d am: 52648a7913 am: 7ac4b0bf54 
am: 2359b62819

* commit '2359b62819eae0b2daac1a3c99fc888cf8534957':
  docs: Created content describing high-performance audio.

Change-Id: Ia0e66e1fef279f21a65128f5211055dd6b1e46f7
 2016-05-12 02:42:04 +00:00
Dirk Dougherty
0519569eaa Merge "Remove broken video embed." into mnc-mr-docs am: 80a3c76891 
am: 1d5d20fba9

* commit '1d5d20fba982fcca5c6664b52bbef803126820ae':
  Remove broken video embed.

Change-Id: I23f583a4dd1d7f236d1a156683eff9be09f8fa25
 2016-05-12 02:28:32 +00:00
David Friedman
0c01d17117 Merge "Docs: Removes "Guidelines for Education" card from "Essentials". am: 186284a6a6 am: 2e23d6eb96" into mnc-ub-dev 
am: 23e4fb8137

* commit '23e4fb813764e7df0094f7e620656c1e4d593267':

Change-Id: I9f085c6d81a4624d3d6d6f65c4787fa226e043f7
 2016-05-12 02:27:03 +00:00
David Friedman
c58d6fa488 Docs: Removes "Guidelines for Education" card from "Essentials". am: 186284a6a6 am: 2e23d6eb96 
am: 3f6af30cae

* commit '3f6af30cae649deb8530706984ece5b4f7418743':
  Docs: Removes "Guidelines for Education" card from "Essentials".

Change-Id: I358a3648737c00056f59a69c9da6969512daaf79
 2016-05-12 02:25:17 +00:00
Dirk Dougherty
1d5d20fba9 Merge "Remove broken video embed." into mnc-mr-docs 
am: 80a3c76891

* commit '80a3c7689155cc78c020a7c7a8cdd04df323e023':
  Remove broken video embed.

Change-Id: Id26636c13e3b848d217c77f82661f023735fd426
 2016-05-12 02:24:27 +00:00
Kevin Hufnagle
2359b62819 docs: Created content describing high-performance audio. am: 44aff87b6d am: 52648a7913 
am: 7ac4b0bf54

* commit '7ac4b0bf54503ad34921a455c071f01df605ec26':
  docs: Created content describing high-performance audio.

Change-Id: I5bae49b50656d07e5d82dad9093050dee9af97f3
 2016-05-12 02:22:45 +00:00
Android Build Merger (Role)
23e4fb8137 Merge "Docs: Removes "Guidelines for Education" card from "Essentials". am: 186284a6a6 am: 2e23d6eb96" into mnc-ub-dev 2016-05-12 02:18:50 +00:00
David Friedman
5f544051ff Docs: Removes "Guidelines for Education" card from "Essentials". am: 186284a6a6 
am: 2e23d6eb96

* commit '2e23d6eb964d48796c828231ded0517b1a661d94':
  Docs: Removes "Guidelines for Education" card from "Essentials".

Change-Id: I2afb88fe2117ae39202d4f6127d0b1520a84b0c8
 2016-05-12 02:18:30 +00:00
Kevin Hufnagle
7ac4b0bf54 docs: Created content describing high-performance audio. am: 44aff87b6d 
am: 52648a7913

* commit '52648a7913f696993aea6bae5abc9b4e6ef0ede3':
  docs: Created content describing high-performance audio.

Change-Id: Iba626b552800459f2314eadba2d48a194891248a
 2016-05-12 02:18:25 +00:00
David Friedman
3f6af30cae Docs: Removes "Guidelines for Education" card from "Essentials". am: 186284a6a6 
am: 2e23d6eb96

* commit '2e23d6eb964d48796c828231ded0517b1a661d94':
  Docs: Removes "Guidelines for Education" card from "Essentials".

Change-Id: I54d1eed129ab92c7876847373a67a9ba0dbc7a16
 2016-05-12 02:13:44 +00:00
Dirk Dougherty
80a3c76891 Merge "Remove broken video embed." into mnc-mr-docs 2016-05-12 02:13:36 +00:00
Kevin Hufnagle
52648a7913 docs: Created content describing high-performance audio. 
am: 44aff87b6d

* commit '44aff87b6decadc91f0725b70cfb7a4d1da67b84':
  docs: Created content describing high-performance audio.

Change-Id: Id9d72ce45dff409f88d5a0d6e179eed1001dc829
 2016-05-12 02:12:59 +00:00